Skip to content

Commit

Permalink
net: remove ixp2000 ethernet driver
Browse files Browse the repository at this point in the history
The platform is removed, so there are no users of this driver.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
Cc: Don Skidmore <donald.c.skidmore@intel.com>
Cc: Greg Rose <gregory.v.rose@intel.com>
Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Cc: Alex Duyck <alexander.h.duyck@intel.com>
Cc: John Ronciak <john.ronciak@intel.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Rob Herring authored and David S. Miller committed Apr 4, 2012
1 parent e7f8c1f commit 695e007
Show file tree
Hide file tree
Showing 20 changed files with 3 additions and 2,549 deletions.
6 changes: 0 additions & 6 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -3516,12 +3516,6 @@ M: Deepak Saxena <dsaxena@plexity.net>
S: Maintained
F: drivers/char/hw_random/ixp4xx-rng.c

INTEL IXP2000 ETHERNET DRIVER
M: Lennert Buytenhek <kernel@wantstofly.org>
L: netdev@vger.kernel.org
S: Maintained
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>
M: Jesse Brandeburg <jesse.brandeburg@intel.com>
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/intel/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ config NET_VENDOR_INTEL
default y
depends on PCI || PCI_MSI || ISA || ISA_DMA_API || ARM || \
ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
GSC || BVME6000 || MVME16x || ARCH_ENP2611 || \
GSC || BVME6000 || MVME16x || \
(ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR) || \
EXPERIMENTAL
---help---
Expand Down
6 changes: 2 additions & 4 deletions drivers/net/ethernet/xscale/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
config NET_VENDOR_XSCALE
bool "Intel XScale IXP devices"
default y
depends on NET_VENDOR_INTEL && ((ARM && ARCH_IXP4XX && \
IXP4XX_NPE && IXP4XX_QMGR) || ARCH_ENP2611)
depends on NET_VENDOR_INTEL && (ARM && ARCH_IXP4XX && \
IXP4XX_NPE && IXP4XX_QMGR)
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
Expand All @@ -27,6 +27,4 @@ config IXP4XX_ETH
Say Y here if you want to use built-in Ethernet ports
on IXP4xx processor.

source "drivers/net/ethernet/xscale/ixp2000/Kconfig"

endif # NET_VENDOR_XSCALE
1 change: 0 additions & 1 deletion drivers/net/ethernet/xscale/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
# Makefile for the Intel XScale IXP device drivers.
#

obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o
6 changes: 0 additions & 6 deletions drivers/net/ethernet/xscale/ixp2000/Kconfig

This file was deleted.

3 changes: 0 additions & 3 deletions drivers/net/ethernet/xscale/ixp2000/Makefile

This file was deleted.

136 changes: 0 additions & 136 deletions drivers/net/ethernet/xscale/ixp2000/caleb.c

This file was deleted.

22 changes: 0 additions & 22 deletions drivers/net/ethernet/xscale/ixp2000/caleb.h

This file was deleted.

Loading

0 comments on commit 695e007

Please sign in to comment.