Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b47da977 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

xscale: Move the Intel XScale IXP drivers



Move the Intel XScale IXP drivers into drivers/net/ethernet/xscale/
and make the necessary Kconfig and Makefile changes.

CC: Krzysztof Halasa <khc@pm.waw.pl>
CC: Lennert Buytenhek <kernel@wantstofly.org>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d9fb9f38
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -3319,7 +3319,7 @@ F: arch/arm/mach-ixp4xx/include/mach/qmgr.h
F:	arch/arm/mach-ixp4xx/include/mach/npe.h
F:	arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
F:	arch/arm/mach-ixp4xx/ixp4xx_npe.c
F:	drivers/net/arm/ixp4xx_eth.c
F:	drivers/net/ethernet/xscale/ixp4xx_eth.c
F:	drivers/net/wan/ixp4xx_hss.c

INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
@@ -3331,7 +3331,7 @@ INTEL IXP2000 ETHERNET DRIVER
M:	Lennert Buytenhek <kernel@wantstofly.org>
L:	netdev@vger.kernel.org
S:	Maintained
F:	drivers/net/ixp2000/
F:	drivers/net/ethernet/xscale/ixp2000/

INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
M:	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+0 −2
Original line number Diff line number Diff line
@@ -989,8 +989,6 @@ config IP1000
	  To compile this driver as a module, choose M here: the module
	  will be called ipg.  This is recommended.

source "drivers/net/ixp2000/Kconfig"

config HAMACHI
	tristate "Packet Engines Hamachi GNIC-II support"
	depends on PCI
+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ obj-$(CONFIG_NET_TULIP) += tulip/
obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/

obj-$(CONFIG_NETCONSOLE) += netconsole.o

+0 −8
Original line number Diff line number Diff line
@@ -34,14 +34,6 @@ config EP93XX_ETH
	  This is a driver for the ethernet hardware included in EP93xx CPUs.
	  Say Y if you are building a kernel for EP93xx based devices.

config IXP4XX_ETH
	tristate "Intel IXP4xx Ethernet support"
	depends on ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR
	select PHYLIB
	help
	  Say Y here if you want to use built-in Ethernet ports
	  on IXP4xx processor.

config W90P910_ETH
	tristate "Nuvoton w90p910 Ethernet support"
	depends on ARM && ARCH_W90X900
+0 −1
Original line number Diff line number Diff line
@@ -7,5 +7,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_AT91_ETHER)	+= at91_ether.o
obj-$(CONFIG_ARM_KS8695_ETHER)	+= ks8695net.o
obj-$(CONFIG_EP93XX_ETH)	+= ep93xx_eth.o
obj-$(CONFIG_IXP4XX_ETH)	+= ixp4xx_eth.o
obj-$(CONFIG_W90P910_ETH)	+= w90p910_ether.o
Loading