From a96f84ee7cbb88b74e77ef9966c1862aa667d5eb Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 30 May 2013 03:07:48 +0000 Subject: [PATCH] Drop config for many obsolete Ethernet drivers removed upstream svn path=/dists/sid/linux/; revision=20141 --- debian/config/alpha/config | 28 ------------------- debian/config/hppa/config | 23 --------------- debian/config/hppa/config.parisc | 1 - debian/config/hppa/config.parisc64 | 1 - debian/config/i386/config.486 | 5 ---- debian/config/i386/config.686-pae | 1 - debian/config/kernelarch-x86/config-arch-32 | 24 ---------------- debian/config/m68k/config.amiga | 2 -- debian/config/mips/config.r4k-ip22 | 20 ------------- .../amd64/modules/amd64/nic-extra-modules | 1 - debian/installer/modules/nic-extra-modules | 26 ----------------- 11 files changed, 132 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 3973d6b1b..e5883d078 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -562,7 +562,6 @@ CONFIG_FEALNX=m ## file: drivers/net/ethernet/3com/Kconfig ## CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m CONFIG_EL3=m CONFIG_3C515=m CONFIG_PCMCIA_3C574=m @@ -573,20 +572,11 @@ CONFIG_TYPHOON=m ## ## file: drivers/net/ethernet/8390/Kconfig ## -CONFIG_EL2=m -CONFIG_AC3200=m CONFIG_PCMCIA_AXNET=m -CONFIG_E2100=m -CONFIG_ES3210=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m -CONFIG_LNE390=m CONFIG_NE2000=m CONFIG_NE2K_PCI=m -CONFIG_NE3210=m CONFIG_PCMCIA_PCNET=m CONFIG_ULTRA=m -CONFIG_ULTRA32=m CONFIG_WD80x3=m ## @@ -599,7 +589,6 @@ CONFIG_ADAPTEC_STARFIRE=m ## CONFIG_AMD8111_ETH=m CONFIG_LANCE=m -CONFIG_DEPCA=m CONFIG_PCMCIA_NMCLAN=m CONFIG_NI65=m @@ -616,7 +605,6 @@ CONFIG_CS89x0=m ## ## file: drivers/net/ethernet/dec/Kconfig ## -CONFIG_EWRK3=m ## ## file: drivers/net/ethernet/dec/tulip/Kconfig @@ -640,27 +628,13 @@ CONFIG_SUNDANCE=m ## ## file: drivers/net/ethernet/fujitsu/Kconfig ## -CONFIG_AT1700=m CONFIG_PCMCIA_FMVJ18X=m -CONFIG_ETH16I=m ## ## file: drivers/net/ethernet/hp/Kconfig ## CONFIG_HP100=m -## -## file: drivers/net/ethernet/i825xx/Kconfig -## -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_APRICOT=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_LP486E=m -CONFIG_NI52=m -CONFIG_ZNET=m - ## ## file: drivers/net/ethernet/intel/Kconfig ## @@ -680,7 +654,6 @@ CONFIG_FORCEDETH=m ## file: drivers/net/ethernet/racal/Kconfig ## CONFIG_NET_VENDOR_RACAL=y -CONFIG_NI5010=m ## ## file: drivers/net/ethernet/realtek/Kconfig @@ -695,7 +668,6 @@ CONFIG_8139TOO_8129=y ## ## file: drivers/net/ethernet/seeq/Kconfig ## -CONFIG_SEEQ8005=m ## ## file: drivers/net/ethernet/sis/Kconfig diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 0aab21979..12d4cf877 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -213,7 +213,6 @@ CONFIG_FEALNX=m ## file: drivers/net/ethernet/3com/Kconfig ## CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m CONFIG_EL3=m # CONFIG_3C515 is not set CONFIG_PCMCIA_3C574=m @@ -224,20 +223,11 @@ CONFIG_TYPHOON=m ## ## file: drivers/net/ethernet/8390/Kconfig ## -CONFIG_EL2=m -CONFIG_AC3200=m CONFIG_PCMCIA_AXNET=m -CONFIG_E2100=m -CONFIG_ES3210=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m -CONFIG_LNE390=m CONFIG_NE2000=m CONFIG_NE2K_PCI=m -CONFIG_NE3210=m CONFIG_PCMCIA_PCNET=m CONFIG_ULTRA=m -CONFIG_ULTRA32=m CONFIG_WD80x3=m ## @@ -250,7 +240,6 @@ CONFIG_ADAPTEC_STARFIRE=m ## CONFIG_AMD8111_ETH=m # CONFIG_LANCE is not set -CONFIG_DEPCA=m CONFIG_PCMCIA_NMCLAN=m # CONFIG_NI65 is not set @@ -267,7 +256,6 @@ CONFIG_CS89x0=m ## ## file: drivers/net/ethernet/dec/Kconfig ## -CONFIG_EWRK3=m ## ## file: drivers/net/ethernet/dec/tulip/Kconfig @@ -290,9 +278,7 @@ CONFIG_SUNDANCE=m ## ## file: drivers/net/ethernet/fujitsu/Kconfig ## -CONFIG_AT1700=m CONFIG_PCMCIA_FMVJ18X=m -CONFIG_ETH16I=m ## ## file: drivers/net/ethernet/hp/Kconfig @@ -302,15 +288,7 @@ CONFIG_HP100=m ## ## file: drivers/net/ethernet/i825xx/Kconfig ## -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_APRICOT=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m CONFIG_LASI_82596=m -CONFIG_LP486E=m -# CONFIG_NI52 is not set -CONFIG_ZNET=m ## ## file: drivers/net/ethernet/intel/Kconfig @@ -350,7 +328,6 @@ CONFIG_8139TOO=m ## ## file: drivers/net/ethernet/seeq/Kconfig ## -CONFIG_SEEQ8005=m ## ## file: drivers/net/ethernet/sis/Kconfig diff --git a/debian/config/hppa/config.parisc b/debian/config/hppa/config.parisc index cf3910227..260dfb382 100644 --- a/debian/config/hppa/config.parisc +++ b/debian/config/hppa/config.parisc @@ -11,7 +11,6 @@ CONFIG_PA7000=y ## ## file: drivers/net/ethernet/racal/Kconfig ## -# CONFIG_NI5010 is not set ## ## file: drivers/net/ethernet/ti/Kconfig diff --git a/debian/config/hppa/config.parisc64 b/debian/config/hppa/config.parisc64 index a9363327e..6a3562a33 100644 --- a/debian/config/hppa/config.parisc64 +++ b/debian/config/hppa/config.parisc64 @@ -11,7 +11,6 @@ CONFIG_64BIT=y ## ## file: drivers/net/ethernet/racal/Kconfig ## -# CONFIG_NI5010 is not set ## ## file: mm/Kconfig diff --git a/debian/config/i386/config.486 b/debian/config/i386/config.486 index c988f64db..719f4c957 100644 --- a/debian/config/i386/config.486 +++ b/debian/config/i386/config.486 @@ -59,10 +59,6 @@ CONFIG_MOUSE_PS2_OLPC=y ## file: drivers/net/ethernet/8390/Kconfig ## CONFIG_NET_VENDOR_8390=y -CONFIG_ES3210=m -CONFIG_LNE390=m -CONFIG_NE3210=m -CONFIG_ULTRA32=m ## ## file: drivers/net/ethernet/i825xx/Kconfig @@ -78,7 +74,6 @@ CONFIG_NET_VENDOR_NATSEMI=y ## file: drivers/net/ethernet/racal/Kconfig ## CONFIG_NET_VENDOR_RACAL=y -CONFIG_NI5010=m ## ## file: drivers/net/hamradio/Kconfig diff --git a/debian/config/i386/config.686-pae b/debian/config/i386/config.686-pae index 3bc1f0a85..d920f00c1 100644 --- a/debian/config/i386/config.686-pae +++ b/debian/config/i386/config.686-pae @@ -35,7 +35,6 @@ CONFIG_I2C_STUB=m ## ## file: drivers/net/ethernet/racal/Kconfig ## -# CONFIG_NI5010 is not set ## ## file: drivers/net/hamradio/Kconfig diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index 262841559..082c42fb9 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -247,7 +247,6 @@ CONFIG_CAN_CC770_ISA=m ## file: drivers/net/ethernet/3com/Kconfig ## CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m CONFIG_EL3=m CONFIG_3C515=m @@ -255,11 +254,6 @@ CONFIG_3C515=m ## file: drivers/net/ethernet/8390/Kconfig ## CONFIG_NET_VENDOR_8390=y -CONFIG_EL2=m -CONFIG_AC3200=m -CONFIG_E2100=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m CONFIG_NE2000=m CONFIG_ULTRA=m CONFIG_WD80x3=m @@ -269,7 +263,6 @@ CONFIG_WD80x3=m ## CONFIG_NET_VENDOR_AMD=y CONFIG_LANCE=m -CONFIG_DEPCA=m CONFIG_NI65=m ## @@ -282,27 +275,11 @@ CONFIG_CS89x0=m ## file: drivers/net/ethernet/dec/Kconfig ## CONFIG_NET_VENDOR_DEC=y -CONFIG_EWRK3=m ## ## file: drivers/net/ethernet/fujitsu/Kconfig ## CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_AT1700=m -CONFIG_ETH16I=m - -## -## file: drivers/net/ethernet/i825xx/Kconfig -## -CONFIG_NET_VENDOR_I825XX=y -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_APRICOT=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_LP486E=m -CONFIG_NI52=m -CONFIG_ZNET=m ## ## file: drivers/net/ethernet/realtek/Kconfig @@ -313,7 +290,6 @@ CONFIG_8139TOO_PIO=y ## file: drivers/net/ethernet/seeq/Kconfig ## CONFIG_NET_VENDOR_SEEQ=y -CONFIG_SEEQ8005=m ## ## file: drivers/net/ethernet/smsc/Kconfig diff --git a/debian/config/m68k/config.amiga b/debian/config/m68k/config.amiga index 333dd5bdb..3385fae3f 100644 --- a/debian/config/m68k/config.amiga +++ b/debian/config/m68k/config.amiga @@ -157,12 +157,10 @@ CONFIG_ZORRO8390=m ## CONFIG_A2065=m CONFIG_ARIADNE=m -# CONFIG_DEPCA is not set ## ## file: drivers/net/ethernet/fujitsu/Kconfig ## -# CONFIG_AT1700 is not set ## ## file: drivers/net/ethernet/hp/Kconfig diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index 4746f2044..e56e51f07 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -295,19 +295,10 @@ CONFIG_VIDEO_VINO=m ## ## file: drivers/net/ethernet/8390/Kconfig ## -CONFIG_E2100=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m CONFIG_NE2000=m CONFIG_ULTRA=m -CONFIG_ULTRA32=m CONFIG_WD80x3=m -## -## file: drivers/net/ethernet/amd/Kconfig -## -# CONFIG_DEPCA is not set - ## ## file: drivers/net/ethernet/davicom/Kconfig ## @@ -316,7 +307,6 @@ CONFIG_WD80x3=m ## ## file: drivers/net/ethernet/dec/Kconfig ## -CONFIG_EWRK3=m ## ## file: drivers/net/ethernet/dec/tulip/Kconfig @@ -326,21 +316,12 @@ CONFIG_EWRK3=m ## ## file: drivers/net/ethernet/fujitsu/Kconfig ## -# CONFIG_AT1700 is not set -CONFIG_ETH16I=m ## ## file: drivers/net/ethernet/hp/Kconfig ## # CONFIG_HP100 is not set -## -## file: drivers/net/ethernet/i825xx/Kconfig -## -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_LP486E=m - ## ## file: drivers/net/ethernet/racal/Kconfig ## @@ -349,7 +330,6 @@ CONFIG_LP486E=m ## ## file: drivers/net/ethernet/seeq/Kconfig ## -CONFIG_SEEQ8005=m CONFIG_SGISEEQ=y ## diff --git a/debian/installer/amd64/modules/amd64/nic-extra-modules b/debian/installer/amd64/modules/amd64/nic-extra-modules index 3e59d866c..75e2d7810 100644 --- a/debian/installer/amd64/modules/amd64/nic-extra-modules +++ b/debian/installer/amd64/modules/amd64/nic-extra-modules @@ -1,2 +1 @@ #include -eexpress - diff --git a/debian/installer/modules/nic-extra-modules b/debian/installer/modules/nic-extra-modules index 7babc1afd..ed74a6796 100644 --- a/debian/installer/modules/nic-extra-modules +++ b/debian/installer/modules/nic-extra-modules @@ -1,29 +1,17 @@ -82596 ? -ac3200 ? alx ? amd8111e ? -at1700 ? cs89x0 ? -depca ? dl2k dmfe -e2100 ? -eepro ? enc28j60 et131x ? forcedeth ? hamachi -hp-plus ? -hp100 ? igb ipg ? lance ? -lne390 ? -lp486e ? ne ? ne2 ? -ni5010 ? -ni52 ? ni65 ? niu ? r8169 @@ -35,37 +23,24 @@ smc-ultra ? tlan ? typhoon yellowfin -3c501 ? -3c503 ? -3c505 ? -3c507 ? 3c509 ? 3c515 ? 3c523 ? 3c527 ? 8139cp -eexpress ? epic100 -es3210 ? -eth16i ? -ewrk3 ? fealnx ns83820 -smc-ultra32 ? smc9194 ? starfire sundance arlan ? de2104x ? -de600 ? -de620 ? defxx ? e1000 ? e1000e ? -hp ? ixgb ? ixgbe ? -ne3210 ? pcnet32 ? s2io ? sis190 ? @@ -73,7 +48,6 @@ sis900 ? via-rhine ? via-velocity ? wd ? -znet ? bnx2 ? bnx2x ? cassini ?