diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:12:48 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:12:48 +0200 |
commit | d1e65d2a7bd9162e7009da870adb15c70b620320 (patch) | |
tree | 8eb7152b40e2f5868984f5f36cdfa142db53937c /drivers/net/usb | |
parent | cd323c02240af01eb914c87d9d7c41db6e34984b (diff) | |
parent | 77322aa896895f4f68501a071086e432e575dcc2 (diff) | |
download | barebox-d1e65d2a7bd9162e7009da870adb15c70b620320.tar.gz barebox-d1e65d2a7bd9162e7009da870adb15c70b620320.tar.xz |
Merge branch 'for-next/remove-fsf-address'
Conflicts:
drivers/net/miidev.c
include/miidev.h
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/smsc95xx.c | 4 | ||||
-rw-r--r-- | drivers/net/usb/smsc95xx.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 11f2795fb9..38ca12f257 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -12,10 +12,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * *****************************************************************************/ #include <common.h> diff --git a/drivers/net/usb/smsc95xx.h b/drivers/net/usb/smsc95xx.h index 86bc44977f..265df682bf 100644 --- a/drivers/net/usb/smsc95xx.h +++ b/drivers/net/usb/smsc95xx.h @@ -12,10 +12,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * *****************************************************************************/ #ifndef _SMSC95XX_H |