summaryrefslogtreecommitdiff
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-06-18 01:52:36 -0700
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-12 12:38:26 -0700
commit9f2f381f813858755f5b6ef7af316feda0726ef3 (patch)
treed92fe910d8a8ef2c06ddeeb88ecd786d315f713e /drivers/net/Makefile
parent7b35f03338a8557122e62ea1a011f1628b978e8d (diff)
downloadlinux-3.10-9f2f381f813858755f5b6ef7af316feda0726ef3.tar.gz
linux-3.10-9f2f381f813858755f5b6ef7af316feda0726ef3.tar.bz2
linux-3.10-9f2f381f813858755f5b6ef7af316feda0726ef3.zip
macb: Move the Atmel driver
Move the Atmel driver into drivers/net/ethernet/cadence/ and make the necessary Kconfig and Makefile changes. CC: Nicolas Ferre <nicolas.ferre@atmel.com> CC: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r--drivers/net/Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d249d76ce2f..d7873bad9dd 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -63,9 +63,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_GRETH) += greth.o
obj-$(CONFIG_DNET) += dnet.o
-obj-$(CONFIG_MACB) += macb.o
-
-obj-$(CONFIG_ARM) += arm/
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_TR) += tokenring/