---

yaml --- r: 300495 b: refs/heads/master c: 695e007 h: refs/heads/master i: 300493: d216eea 300491: 36af683 300487: 6fc7990 300479: f040706 v: v3
git-mirror · Apr 4, 2012 · d5746fb · d5746fb
1 parent 18f960e
commit d5746fb
Show file tree

Hide file tree

Showing 21 changed files with 4 additions and 2,550 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7f8c1fe1705e78f56ca4c8350545ad58d73451a
+refs/heads/master: 695e00789a2703e79da9adf3cd868fe54142885e
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -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>

diff --git a/trunk/drivers/net/ethernet/intel/Kconfig b/trunk/drivers/net/ethernet/intel/Kconfig
@@ -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---

diff --git a/trunk/drivers/net/ethernet/xscale/Kconfig b/trunk/drivers/net/ethernet/xscale/Kconfig
@@ -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
@@ -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
diff --git a/trunk/drivers/net/ethernet/xscale/Makefile b/trunk/drivers/net/ethernet/xscale/Makefile
@@ -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
diff --git a/trunk/drivers/net/ethernet/xscale/ixp2000/Kconfig b/trunk/drivers/net/ethernet/xscale/ixp2000/Kconfig
diff --git a/trunk/drivers/net/ethernet/xscale/ixp2000/Makefile b/trunk/drivers/net/ethernet/xscale/ixp2000/Makefile
diff --git a/trunk/drivers/net/ethernet/xscale/ixp2000/caleb.c b/trunk/drivers/net/ethernet/xscale/ixp2000/caleb.c
diff --git a/trunk/drivers/net/ethernet/xscale/ixp2000/caleb.h b/trunk/drivers/net/ethernet/xscale/ixp2000/caleb.h