Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ftgmac100/ftmac100: Move the Faraday drivers

Move the Faraday driver into drivers/net/ethernet/faraday/ and
make the necessary Kconfig and Makefile changes.

CC: "Po-Yu Chuang" <ratbert@faraday-tech.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Po-Yu Chuang <ratbert@faraday-tech.com>

+46 -20
-18
drivers/net/Kconfig
··· 922 922 help 923 923 This driver supports the 10/100 Ethernet Lite from Xilinx. 924 924 925 - config FTMAC100 926 - tristate "Faraday FTMAC100 10/100 Ethernet support" 927 - depends on ARM 928 - select MII 929 - help 930 - This driver supports the FTMAC100 10/100 Ethernet controller 931 - from Faraday. It is used on Faraday A320, Andes AG101 and some 932 - other ARM/NDS32 SoC's. 933 - 934 925 config LANTIQ_ETOP 935 926 tristate "Lantiq SoC ETOP driver" 936 927 depends on SOC_TYPE_XWAY ··· 1276 1285 ML7223 IOH is for MP(Media Phone) use. 1277 1286 ML7223 is companion chip for Intel Atom E6xx series. 1278 1287 ML7223 is completely compatible for Intel EG20T PCH. 1279 - 1280 - config FTGMAC100 1281 - tristate "Faraday FTGMAC100 Gigabit Ethernet support" 1282 - depends on ARM 1283 - select PHYLIB 1284 - help 1285 - This driver supports the FTGMAC100 Gigabit Ethernet controller 1286 - from Faraday. It is used on Faraday A369, Andes AG102 and some 1287 - other ARM/NDS32 SoC's. 1288 1288 1289 1289 endif # NETDEV_1000 1290 1290
-2
drivers/net/Makefile
··· 79 79 obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o 80 80 endif 81 81 obj-$(CONFIG_FORCEDETH) += forcedeth.o 82 - obj-$(CONFIG_FTGMAC100) += ftgmac100.o 83 - obj-$(CONFIG_FTMAC100) += ftmac100.o 84 82 85 83 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o 86 84 obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
+1
drivers/net/ethernet/Kconfig
··· 20 20 source "drivers/net/ethernet/cisco/Kconfig" 21 21 source "drivers/net/ethernet/emulex/Kconfig" 22 22 source "drivers/net/ethernet/neterion/Kconfig" 23 + source "drivers/net/ethernet/faraday/Kconfig" 23 24 source "drivers/net/ethernet/ibm/Kconfig" 24 25 source "drivers/net/ethernet/intel/Kconfig" 25 26 source "drivers/net/ethernet/i825xx/Kconfig"
+1
drivers/net/ethernet/Makefile
··· 12 12 obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/ 13 13 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/ 14 14 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/ 15 + obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/ 15 16 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ 16 17 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ 17 18 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
+38
drivers/net/ethernet/faraday/Kconfig
··· 1 + # 2 + # Faraday device configuration 3 + # 4 + 5 + config NET_VENDOR_FARADAY 6 + bool "Faraday devices" 7 + depends on ARM 8 + ---help--- 9 + If you have a network (Ethernet) card belonging to this class, say Y 10 + and read the Ethernet-HOWTO, available from 11 + <http://www.tldp.org/docs.html#howto>. 12 + 13 + Note that the answer to this question doesn't directly affect the 14 + kernel: saying N will just cause the configurator to skip all 15 + the questions about Faraday cards. If you say Y, you will be asked for 16 + your specific card in the following questions. 17 + 18 + if NET_VENDOR_FARADAY 19 + 20 + config FTMAC100 21 + tristate "Faraday FTMAC100 10/100 Ethernet support" 22 + depends on ARM 23 + select MII 24 + ---help--- 25 + This driver supports the FTMAC100 10/100 Ethernet controller 26 + from Faraday. It is used on Faraday A320, Andes AG101 and some 27 + other ARM/NDS32 SoC's. 28 + 29 + config FTGMAC100 30 + tristate "Faraday FTGMAC100 Gigabit Ethernet support" 31 + depends on ARM 32 + select PHYLIB 33 + ---help--- 34 + This driver supports the FTGMAC100 Gigabit Ethernet controller 35 + from Faraday. It is used on Faraday A369, Andes AG102 and some 36 + other ARM/NDS32 SoC's. 37 + 38 + endif # NET_VENDOR_FARADAY
+6
drivers/net/ethernet/faraday/Makefile
··· 1 + # 2 + # Makefile for the Faraday device drivers. 3 + # 4 + 5 + obj-$(CONFIG_FTGMAC100) += ftgmac100.o 6 + obj-$(CONFIG_FTMAC100) += ftmac100.o
drivers/net/ftgmac100.c drivers/net/ethernet/faraday/ftgmac100.c
drivers/net/ftgmac100.h drivers/net/ethernet/faraday/ftgmac100.h
drivers/net/ftmac100.c drivers/net/ethernet/faraday/ftmac100.c
drivers/net/ftmac100.h drivers/net/ethernet/faraday/ftmac100.h