From 1b9f41da87a85e689943bebabcbeda39d70d71f9 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 16 Jul 2011 12:35:27 -0700 Subject: [PATCH] --- yaml --- r: 256481 b: refs/heads/master c: 2d9a8db54c4b1e206adb3b7942aefd544306560f h: refs/heads/master i: 256479: 5d2449019360c72f1c3852a59768db8103b69628 v: v3 --- [refs] | 2 +- trunk/drivers/net/Kconfig | 7 ------- trunk/drivers/net/Makefile | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 114c34fb958b..e1a0a83002ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd6340199f65cad63262db0fd561bdcfd69df3bd +refs/heads/master: 2d9a8db54c4b1e206adb3b7942aefd544306560f diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 17ed4dda7c04..8d0314dbd946 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -1934,13 +1934,6 @@ config DECLANCE DEC (now Compaq) based on the AMD Lance chipset, including the DEPCA series. (This chipset is better known via the NE2100 cards.) -config 68360_ENET - bool "Motorola 68360 ethernet controller" - depends on M68360 - help - Say Y here if you want to use the built-in ethernet controller of - the Motorola 68360 processor. - config FEC bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile index 86f6c8d08407..b7622c3745fa 100644 --- a/trunk/drivers/net/Makefile +++ b/trunk/drivers/net/Makefile @@ -127,7 +127,6 @@ obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y) obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o endif -obj-$(CONFIG_68360_ENET) += 68360enet.o obj-$(CONFIG_WD80x3) += wd.o 8390.o obj-$(CONFIG_EL2) += 3c503.o 8390p.o obj-$(CONFIG_NE2000) += ne.o 8390p.o