diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-20 23:18:55 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 03:21:51 -0400 |
commit | 527a626601de6ff89859de90883cc546892bf3ca (patch) | |
tree | 5e30febb8d509e036cee5702676f386a0d4e4ad3 /drivers/net/Makefile | |
parent | 1c1538be1da768fe0209a11e1bdf9dd7ab38905a (diff) |
skge/sky2/mv643xx/pxa168: Move the Marvell Ethernet drivers
Move the Marvell Ethernet drivers into drivers/net/ethernet/marvell/
and make the necessary Kconfig and Makefile changes.
CC: Sachin Sanap <ssanap@marvell.com>
CC: Zhangfei Gao <zgao6@marvell.com>
CC: Philip Rakity <prakity@marvell.com>
CC: Mark Brown <markb@marvell.com>
CC: Lennert Buytenhek <buytenh@marvell.com>
CC: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r-- | drivers/net/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 141ed251f52..69ca6a009c5 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -46,8 +46,6 @@ obj-$(CONFIG_GELIC_NET) += ps3_gelic.o | |||
46 | gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o | 46 | gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o |
47 | ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y) | 47 | ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y) |
48 | obj-$(CONFIG_TC35815) += tc35815.o | 48 | obj-$(CONFIG_TC35815) += tc35815.o |
49 | obj-$(CONFIG_SKGE) += skge.o | ||
50 | obj-$(CONFIG_SKY2) += sky2.o | ||
51 | obj-$(CONFIG_SKFP) += skfp/ | 49 | obj-$(CONFIG_SKFP) += skfp/ |
52 | obj-$(CONFIG_KS8842) += ks8842.o | 50 | obj-$(CONFIG_KS8842) += ks8842.o |
53 | obj-$(CONFIG_KS8851) += ks8851.o | 51 | obj-$(CONFIG_KS8851) += ks8851.o |
@@ -75,7 +73,6 @@ endif | |||
75 | obj-$(CONFIG_FORCEDETH) += forcedeth.o | 73 | obj-$(CONFIG_FORCEDETH) += forcedeth.o |
76 | 74 | ||
77 | obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o | 75 | obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o |
78 | obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o | ||
79 | ll_temac-objs := ll_temac_main.o ll_temac_mdio.o | 76 | ll_temac-objs := ll_temac_main.o ll_temac_mdio.o |
80 | obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o | 77 | obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o |
81 | obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o | 78 | obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o |
@@ -111,7 +108,6 @@ obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o | |||
111 | obj-$(CONFIG_TUN) += tun.o | 108 | obj-$(CONFIG_TUN) += tun.o |
112 | obj-$(CONFIG_VETH) += veth.o | 109 | obj-$(CONFIG_VETH) += veth.o |
113 | obj-$(CONFIG_NET_NETX) += netx-eth.o | 110 | obj-$(CONFIG_NET_NETX) += netx-eth.o |
114 | obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o | ||
115 | obj-$(CONFIG_BFIN_MAC) += bfin_mac.o | 111 | obj-$(CONFIG_BFIN_MAC) += bfin_mac.o |
116 | obj-$(CONFIG_DM9000) += dm9000.o | 112 | obj-$(CONFIG_DM9000) += dm9000.o |
117 | obj-$(CONFIG_ENC28J60) += enc28j60.o | 113 | obj-$(CONFIG_ENC28J60) += enc28j60.o |