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

cirrus: Move the Cirrus network driver

Move the Cirrus Ethernet driver into drivers/net/ethernet/cirrus/
and make the necessary Kconfig and Makefile changes

CC: Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

+36 -10
+1 -1
MAINTAINERS
··· 1768 1768 M: Hartley Sweeten <hsweeten@visionengravers.com> 1769 1769 L: netdev@vger.kernel.org 1770 1770 S: Maintained 1771 - F: drivers/net/arm/ep93xx_eth.c 1771 + F: drivers/net/ethernet/cirrus/ep93xx_eth.c 1772 1772 1773 1773 CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER 1774 1774 M: Lennert Buytenhek <kernel@wantstofly.org>
-8
drivers/net/arm/Kconfig
··· 11 11 If you wish to compile a kernel for the AT91RM9200 and enable 12 12 ethernet support, then you should always answer Y to this. 13 13 14 - config EP93XX_ETH 15 - tristate "EP93xx Ethernet support" 16 - depends on ARM && ARCH_EP93XX 17 - select MII 18 - help 19 - This is a driver for the ethernet hardware included in EP93xx CPUs. 20 - Say Y if you are building a kernel for EP93xx based devices. 21 - 22 14 config W90P910_ETH 23 15 tristate "Nuvoton w90p910 Ethernet support" 24 16 depends on ARM && ARCH_W90X900
-1
drivers/net/arm/Makefile
··· 4 4 # 5 5 6 6 obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o 7 - obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o 8 7 obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o
drivers/net/arm/ep93xx_eth.c drivers/net/ethernet/cirrus/ep93xx_eth.c
+1
drivers/net/ethernet/Kconfig
··· 18 18 source "drivers/net/ethernet/broadcom/Kconfig" 19 19 source "drivers/net/ethernet/brocade/Kconfig" 20 20 source "drivers/net/ethernet/chelsio/Kconfig" 21 + source "drivers/net/ethernet/cirrus/Kconfig" 21 22 source "drivers/net/ethernet/cisco/Kconfig" 22 23 source "drivers/net/ethernet/dec/Kconfig" 23 24 source "drivers/net/ethernet/dlink/Kconfig"
+1
drivers/net/ethernet/Makefile
··· 10 10 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ 11 11 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/ 12 12 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ 13 + obj-$(CONFIG_NET_VENDOR_CIRRUS) += cirrus/ 13 14 obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/ 14 15 obj-$(CONFIG_NET_VENDOR_DEC) += dec/ 15 16 obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
+28
drivers/net/ethernet/cirrus/Kconfig
··· 1 + # 2 + # Cirrus network device configuration 3 + # 4 + 5 + config NET_VENDOR_CIRRUS 6 + bool "Cirrus devices" 7 + depends on ARM && ARCH_EP93XX 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 Cirrus cards. If you say Y, you will be asked 16 + for your specific card in the following questions. 17 + 18 + if NET_VENDOR_CIRRUS 19 + 20 + config EP93XX_ETH 21 + tristate "EP93xx Ethernet support" 22 + depends on ARM && ARCH_EP93XX 23 + select MII 24 + help 25 + This is a driver for the ethernet hardware included in EP93xx CPUs. 26 + Say Y if you are building a kernel for EP93xx based devices. 27 + 28 + endif # NET_VENDOR_CIRRUS
+5
drivers/net/ethernet/cirrus/Makefile
··· 1 + # 2 + # Makefile for the Cirrus network device drivers. 3 + # 4 + 5 + obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o