diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 701e02565..1ff6669ca 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -774,16 +774,6 @@ CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set CONFIG_DE600=m CONFIG_DE620=m -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_VLAN=y -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m CONFIG_FDDI=y CONFIG_SKFP=m CONFIG_HIPPI=y diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 0e3d61648..6082d3b8c 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -918,15 +918,6 @@ CONFIG_VIA_RHINE=m CONFIG_ATP=m CONFIG_DE600=m CONFIG_DE620=m -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_FDDI=y CONFIG_SKFP=m diff --git a/debian/config/amd64/config.amd64 b/debian/config/amd64/config.amd64 index 788641692..8de8bf678 100644 --- a/debian/config/amd64/config.amd64 +++ b/debian/config/amd64/config.amd64 @@ -33,11 +33,6 @@ CONFIG_DIGIEPCA=m ## # CONFIG_CPU_FREQ_STAT_DETAILS is not set -## -## file: drivers/net/Kconfig -## -CONFIG_R8169_VLAN=y - ## ## file: drivers/video/Kconfig ## diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index 3f99e91bf..d0f294598 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -658,9 +658,6 @@ CONFIG_NE2K_PCI=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set # CONFIG_R8169 is not set -# CONFIG_R8169_VLAN is not set -CONFIG_SIS190=m -CONFIG_SKGE=m # CONFIG_VIA_VELOCITY is not set # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index 4ecd8a1c5..294c490c1 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -518,10 +518,6 @@ CONFIG_NET_ETHERNET=y # CONFIG_DM9000 is not set # CONFIG_HP100 is not set # CONFIG_NET_PCI is not set -CONFIG_E1000=m -CONFIG_R8169=m -CONFIG_R8169_NAPI=y -CONFIG_R8169_VLAN=y ## ## file: drivers/net/appletalk/Kconfig diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 7a1c5796b..1afa939ff 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -279,28 +279,9 @@ CONFIG_VIA_RHINE_NAPI=y CONFIG_SC92031=m CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_E1000E=m # CONFIG_IP1000 is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_NAPI=y -CONFIG_R8169_VLAN=y -CONFIG_SIS190=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_VIA_VELOCITY=m # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set -CONFIG_QLA3XXX=m -CONFIG_ATL1=m # CONFIG_NETDEV_10000 is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set diff --git a/debian/config/config b/debian/config/config index 85764cf7a..c42c0b7f0 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1204,19 +1204,27 @@ CONFIG_ATL2=m CONFIG_NETDEV_1000=y CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_E1000_NAPI=y +CONFIG_DL2K=m +CONFIG_E1000=m # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IP1000=m CONFIG_IGB=m # CONFIG_IGB_LRO is not set CONFIG_IGB_DCA=y -CONFIG_R8169_NAPI=y +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set CONFIG_SKY2=m # CONFIG_SKY2_DEBUG is not set +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m CONFIG_QLA3XXX=m CONFIG_ATL1=m CONFIG_ATL1E=m @@ -1225,15 +1233,12 @@ CONFIG_JME=m CONFIG_NETDEV_10000=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T1_NAPI=y CONFIG_CHELSIO_T3=m CONFIG_ENIC=m CONFIG_IXGBE=m CONFIG_IXGBE_DCA=y CONFIG_IXGB=m -CONFIG_IXGB_NAPI=y CONFIG_S2IO=m -CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y CONFIG_NETXEN_NIC=m diff --git a/debian/config/hppa/config b/debian/config/hppa/config index c0a215f41..8619bec63 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -299,16 +299,6 @@ CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_VLAN=y -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PLIP=m diff --git a/debian/config/i386/config b/debian/config/i386/config index 70285519f..32d574812 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1103,16 +1103,6 @@ CONFIG_VIA_RHINE=m CONFIG_ATP=m CONFIG_DE600=m CONFIG_DE620=m -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_VLAN=y -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_FDDI=y CONFIG_SKFP=m diff --git a/debian/config/ia64/config b/debian/config/ia64/config index ea57da28d..fa29db961 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -492,16 +492,6 @@ CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_VLAN=y -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m CONFIG_FDDI=y CONFIG_SKFP=m # CONFIG_HIPPI is not set diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index c7dc96d5c..320b43870 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -952,25 +952,6 @@ CONFIG_VIA_RHINE_NAPI=y CONFIG_NET_POCKET=y CONFIG_DE600=m CONFIG_DE620=m -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_NAPI=y -CONFIG_R8169_VLAN=y -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_QLA3XXX=m CONFIG_FDDI=y CONFIG_SKFP=m CONFIG_HIPPI=y diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 7e2581f24..235307633 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1169,26 +1169,6 @@ CONFIG_NET_POCKET=y CONFIG_DE600=m CONFIG_DE620=m CONFIG_NETDEV_1000=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_NAPI=y -CONFIG_R8169_VLAN=y -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_QLA3XXX=m -CONFIG_ATL1=m CONFIG_FDDI=y CONFIG_SKFP=m CONFIG_HIPPI=y diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 40a70c01e..e8411c463 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -405,7 +405,6 @@ CONFIG_E100=m # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set -CONFIG_R8169=m # CONFIG_SIS190 is not set # CONFIG_SKGE is not set # CONFIG_SKY2 is not set diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 195cb4e84..f4feb4c5f 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -558,22 +558,6 @@ CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set # CONFIG_LAN_SAA9730 is not set # CONFIG_NET_POCKET is not set -CONFIG_DL2K=m -CONFIG_E1000=m -# CONFIG_E1000_NAPI is not set -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set -CONFIG_SB1250_MAC=y -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m # CONFIG_CHELSIO_T1 is not set # CONFIG_IXGB is not set # CONFIG_S2IO is not set diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index b569d8c0a..2d9231cda 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -559,22 +559,6 @@ CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set # CONFIG_LAN_SAA9730 is not set # CONFIG_NET_POCKET is not set -CONFIG_DL2K=m -CONFIG_E1000=m -# CONFIG_E1000_NAPI is not set -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set -CONFIG_SB1250_MAC=y -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m # CONFIG_CHELSIO_T1 is not set # CONFIG_IXGB is not set # CONFIG_S2IO is not set diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index f645efd66..4ba3d252d 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -951,25 +951,6 @@ CONFIG_VIA_RHINE_NAPI=y CONFIG_NET_POCKET=y CONFIG_DE600=m CONFIG_DE620=m -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_NAPI=y -CONFIG_R8169_VLAN=y -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_QLA3XXX=m CONFIG_FDDI=y CONFIG_SKFP=m CONFIG_HIPPI=y diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 71640429b..8cf6a90d5 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1169,26 +1169,6 @@ CONFIG_NET_POCKET=y CONFIG_DE600=m CONFIG_DE620=m CONFIG_NETDEV_1000=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_NAPI=y -CONFIG_R8169_VLAN=y -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_QLA3XXX=m -CONFIG_ATL1=m CONFIG_FDDI=y CONFIG_SKFP=m CONFIG_HIPPI=y diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index d43b60e46..7ac107ed7 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -558,22 +558,6 @@ CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set # CONFIG_LAN_SAA9730 is not set # CONFIG_NET_POCKET is not set -CONFIG_DL2K=m -CONFIG_E1000=m -# CONFIG_E1000_NAPI is not set -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set -CONFIG_SB1250_MAC=y -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m # CONFIG_CHELSIO_T1 is not set # CONFIG_IXGB is not set # CONFIG_S2IO is not set diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index c2a4e850f..a2285f889 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -558,22 +558,6 @@ CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set # CONFIG_LAN_SAA9730 is not set # CONFIG_NET_POCKET is not set -CONFIG_DL2K=m -CONFIG_E1000=m -# CONFIG_E1000_NAPI is not set -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set -CONFIG_SB1250_MAC=y -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m # CONFIG_CHELSIO_T1 is not set # CONFIG_IXGB is not set # CONFIG_S2IO is not set diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 38459017a..1f9bea65f 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -550,17 +550,6 @@ CONFIG_SUNDANCE_MMIO=y CONFIG_TLAN=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_VLAN=y -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_MV643XX_ETH=m CONFIG_FDDI=y CONFIG_SKFP=m CONFIG_HIPPI=y diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 49a48d2c7..b171902df 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -128,10 +128,7 @@ CONFIG_HAPPYMEAL=m CONFIG_SUNBMAC=m CONFIG_SUNQE=m CONFIG_SUNVNET=m -# CONFIG_HP100 is not set -# CONFIG_HAMACHI is not set -# CONFIG_R8169 is not set -CONFIG_BNX2=m +CONFIG_MYRI_SBUS=m # CONFIG_HIPPI is not set CONFIG_PLIP=m CONFIG_NET_FC=y diff --git a/debian/config/sparc/config.sparc64 b/debian/config/sparc/config.sparc64 index 2cb9f0b86..3fc9c5b77 100644 --- a/debian/config/sparc/config.sparc64 +++ b/debian/config/sparc/config.sparc64 @@ -239,14 +239,6 @@ CONFIG_SUNDANCE=m CONFIG_SUNDANCE_MMIO=y CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_MYRI_SBUS=m -CONFIG_NS83820=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m CONFIG_FDDI=y CONFIG_SKFP=m diff --git a/debian/config/sparc/config.sparc64-smp b/debian/config/sparc/config.sparc64-smp index 522c23634..53e4ce7b7 100644 --- a/debian/config/sparc/config.sparc64-smp +++ b/debian/config/sparc/config.sparc64-smp @@ -242,14 +242,6 @@ CONFIG_SUNDANCE=m CONFIG_SUNDANCE_MMIO=y CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_MYRI_SBUS=m -CONFIG_NS83820=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m CONFIG_FDDI=y CONFIG_SKFP=m