From 4c8ad311813adc15670d360a7704f6bfb16dadc7 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Thu, 15 May 2008 23:12:22 +0000 Subject: [PATCH] kill PCNET32_NAPI references 01935d7d2c544a5dfc8313f79ed164d45115aa33 nuked non NAPI code centralize topconfig PCNET32 settings svn path=/dists/trunk/linux-2.6/; revision=11396 --- debian/config/alpha/config | 1 - debian/config/amd64/config | 1 - debian/config/arm/config.versatile | 2 -- debian/config/config | 2 +- debian/config/hppa/config | 1 - debian/config/i386/config | 1 - debian/config/ia64/config | 1 - debian/config/mips/config.4kc-malta | 1 - debian/config/mips/config.5kc-malta | 2 -- debian/config/mips/config.sb1a-bcm91480b | 1 - debian/config/mipsel/config.4kc-malta | 1 - debian/config/mipsel/config.5kc-malta | 1 - debian/config/mipsel/config.r5k-cobalt | 1 - debian/config/mipsel/config.sb1-bcm91250a | 1 - debian/config/mipsel/config.sb1a-bcm91480b | 1 - debian/config/powerpc/config | 1 - debian/config/sparc/config.sparc64 | 1 - debian/config/sparc/config.sparc64-smp | 1 - 18 files changed, 1 insertion(+), 20 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 9515e5812..18165aaf8 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -797,7 +797,6 @@ CONFIG_NE2000=m CONFIG_ZNET=m CONFIG_SEEQ8005=m CONFIG_NET_PCI=y -CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m CONFIG_ADAPTEC_STARFIRE=m CONFIG_AC3200=m diff --git a/debian/config/amd64/config b/debian/config/amd64/config index b3321a018..08470fdf7 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -898,7 +898,6 @@ CONFIG_VORTEX=m CONFIG_TYPHOON=m CONFIG_HP100=m CONFIG_NET_PCI=y -CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m CONFIG_ADAPTEC_STARFIRE=m CONFIG_B44=m diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 8473de4eb..91b98b2dd 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -585,8 +585,6 @@ CONFIG_SMC91X=y # CONFIG_DM9000 is not set CONFIG_HP100=m CONFIG_NET_PCI=y -CONFIG_PCNET32=m -CONFIG_PCNET32_NAPI=y CONFIG_AMD8111_ETH=m CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m diff --git a/debian/config/config b/debian/config/config index 645eae3dd..fa7ac2100 100644 --- a/debian/config/config +++ b/debian/config/config @@ -964,7 +964,7 @@ CONFIG_MII=m CONFIG_CASSINI=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set -CONFIG_PCNET32_NAPI=y +CONFIG_PCNET32=m CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE_NAPI=y # CONFIG_FORCEDETH_NAPI is not set diff --git a/debian/config/hppa/config b/debian/config/hppa/config index c0c323d69..7d739f34c 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -294,7 +294,6 @@ CONFIG_NE2000=m CONFIG_ZNET=m CONFIG_SEEQ8005=m CONFIG_NET_PCI=y -CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m CONFIG_ADAPTEC_STARFIRE=m CONFIG_AC3200=m diff --git a/debian/config/i386/config b/debian/config/i386/config index 9b3803417..d9e9a80a5 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1084,7 +1084,6 @@ CONFIG_NE2000=m CONFIG_ZNET=m CONFIG_SEEQ8005=m CONFIG_NET_PCI=y -CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m CONFIG_ADAPTEC_STARFIRE=m CONFIG_AC3200=m diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 67b403c50..588e851e7 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -512,7 +512,6 @@ CONFIG_VORTEX=m CONFIG_TYPHOON=m # CONFIG_HP100 is not set CONFIG_NET_PCI=y -CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m CONFIG_ADAPTEC_STARFIRE=m CONFIG_B44=m diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 11c089574..29dd638ac 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1071,7 +1071,6 @@ CONFIG_TYPHOON=m # CONFIG_HP100 is not set CONFIG_NET_PCI=y CONFIG_PCNET32=y -CONFIG_PCNET32_NAPI=y CONFIG_AMD8111_ETH=m CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index bab3b91de..98833bf8f 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1295,8 +1295,6 @@ CONFIG_TYPHOON=m # CONFIG_DM9000 is not set # CONFIG_HP100 is not set CONFIG_NET_PCI=y -CONFIG_PCNET32=y -CONFIG_PCNET32_NAPI=y CONFIG_AMD8111_ETH=m CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 0974cca8d..f79cb5c59 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -585,7 +585,6 @@ CONFIG_MII=y # CONFIG_DM9000 is not set # CONFIG_HP100 is not set CONFIG_NET_PCI=y -CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m # CONFIG_AMD8111E_NAPI is not set CONFIG_ADAPTEC_STARFIRE=m diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 1e4727599..dcab16c9d 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -1070,7 +1070,6 @@ CONFIG_TYPHOON=m # CONFIG_HP100 is not set CONFIG_NET_PCI=y CONFIG_PCNET32=y -CONFIG_PCNET32_NAPI=y CONFIG_AMD8111_ETH=m CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 70543ec31..fddf98228 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1295,7 +1295,6 @@ CONFIG_TYPHOON=m # CONFIG_HP100 is not set CONFIG_NET_PCI=y CONFIG_PCNET32=y -CONFIG_PCNET32_NAPI=y CONFIG_AMD8111_ETH=m CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 402b221f0..11e6fa6e2 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -527,7 +527,6 @@ CONFIG_MII=y # CONFIG_DM9000 is not set # CONFIG_HP100 is not set CONFIG_NET_PCI=y -CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m # CONFIG_AMD8111E_NAPI is not set CONFIG_ADAPTEC_STARFIRE=m diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index 6bf338895..ede11adbd 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -587,7 +587,6 @@ CONFIG_MII=y # CONFIG_DM9000 is not set # CONFIG_HP100 is not set CONFIG_NET_PCI=y -CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m # CONFIG_AMD8111E_NAPI is not set CONFIG_ADAPTEC_STARFIRE=m diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index 1048cd5db..c84883784 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -584,7 +584,6 @@ CONFIG_MII=y # CONFIG_DM9000 is not set # CONFIG_HP100 is not set CONFIG_NET_PCI=y -CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m # CONFIG_AMD8111E_NAPI is not set CONFIG_ADAPTEC_STARFIRE=m diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index deb1843d4..b4510cea5 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -569,7 +569,6 @@ CONFIG_VORTEX=m CONFIG_TYPHOON=m # CONFIG_HP100 is not set CONFIG_NET_PCI=y -CONFIG_PCNET32=m # CONFIG_AMD8111_ETH is not set CONFIG_ADAPTEC_STARFIRE=m CONFIG_B44=m diff --git a/debian/config/sparc/config.sparc64 b/debian/config/sparc/config.sparc64 index ae934ba9b..6635dc5eb 100644 --- a/debian/config/sparc/config.sparc64 +++ b/debian/config/sparc/config.sparc64 @@ -258,7 +258,6 @@ CONFIG_NET_VENDOR_3COM=y CONFIG_VORTEX=m CONFIG_TYPHOON=m CONFIG_NET_PCI=y -CONFIG_PCNET32=m # CONFIG_AMD8111_ETH is not set CONFIG_ADAPTEC_STARFIRE=m CONFIG_B44=m diff --git a/debian/config/sparc/config.sparc64-smp b/debian/config/sparc/config.sparc64-smp index 430b264a4..bdba10274 100644 --- a/debian/config/sparc/config.sparc64-smp +++ b/debian/config/sparc/config.sparc64-smp @@ -260,7 +260,6 @@ CONFIG_NET_VENDOR_3COM=y CONFIG_VORTEX=m CONFIG_TYPHOON=m CONFIG_NET_PCI=y -CONFIG_PCNET32=m # CONFIG_AMD8111_ETH is not set CONFIG_ADAPTEC_STARFIRE=m CONFIG_B44=m