From 3e2cfbab0440c1996808da15977ff64c6334ecc8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 27 Jul 2012 02:27:16 +0000 Subject: [PATCH] Remove references to Token Ring drivers, removed in Linux 3.5 "it looks like the token got loose" svn path=/dists/trunk/linux/; revision=19296 --- debian/config/armel/config.iop32x | 5 ----- debian/config/armel/config.ixp4xx | 5 ----- debian/config/config | 16 ---------------- debian/config/hppa/config | 5 ----- debian/config/i386/none/config.486 | 5 ----- debian/config/m68k/config.amiga | 5 ----- debian/config/mips/config.4kc-malta | 5 ----- debian/config/mips/config.5kc-malta | 5 ----- debian/config/mips/config.r4k-ip22 | 5 ----- debian/config/mips/config.r5k-ip32 | 5 ----- debian/config/mips/config.sb1-bcm91250a | 5 ----- debian/config/mips/config.sb1a-bcm91480b | 5 ----- debian/config/mipsel/config.r5k-cobalt | 5 ----- debian/config/sparc/config | 5 ----- debian/installer/modules/nic-extra-modules | 6 ------ debian/installer/modules/nic-pcmcia-modules | 1 - .../powerpc-powerpc-miboot/nic-extra-modules | 6 ------ .../powerpc/modules/powerpc/nic-extra-modules | 2 -- .../ppc64/modules/ppc64/nic-extra-modules | 1 - 19 files changed, 97 deletions(-) diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 1b35ee7aa..91c2218c4 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -446,11 +446,6 @@ CONFIG_QSEMI_PHY=m CONFIG_LXT_PHY=m CONFIG_CICADA_PHY=m -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/net/wireless/Kconfig ## diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 4da7076f4..4482a3610 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -513,11 +513,6 @@ CONFIG_QSEMI_PHY=m CONFIG_LXT_PHY=m CONFIG_CICADA_PHY=m -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 280e4b3bd..bca5bbbca 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2104,22 +2104,6 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m -## -## file: drivers/net/tokenring/Kconfig -## -CONFIG_TR=y -CONFIG_PCMCIA_IBMTR=m -CONFIG_IBMTR=m -CONFIG_IBMOL=m -CONFIG_IBMLS=m -CONFIG_3C359=m -CONFIG_TMS380TR=m -CONFIG_TMSPCI=m -CONFIG_SKISA=m -CONFIG_PROTEON=m -CONFIG_ABYSS=m -CONFIG_SMCTR=m - ## ## file: drivers/net/usb/Kconfig ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 72ef81462..daa58e86b 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -398,11 +398,6 @@ CONFIG_PCMCIA_XIRC2PS=m ## CONFIG_PLIP=m -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/i386/none/config.486 b/debian/config/i386/none/config.486 index dad30ba4f..75cd0f973 100644 --- a/debian/config/i386/none/config.486 +++ b/debian/config/i386/none/config.486 @@ -93,11 +93,6 @@ CONFIG_NI5010=m ## CONFIG_DMASCC=m -## -## file: drivers/net/tokenring/Kconfig -## -CONFIG_MADGEMC=m - ## ## file: drivers/pci/hotplug/Kconfig ## diff --git a/debian/config/m68k/config.amiga b/debian/config/m68k/config.amiga index 38ead29e9..21443641f 100644 --- a/debian/config/m68k/config.amiga +++ b/debian/config/m68k/config.amiga @@ -174,11 +174,6 @@ CONFIG_ARIADNE=m ## CONFIG_PLIP=m -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/parport/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 939cc6a88..d5f799787 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -750,11 +750,6 @@ CONFIG_BROADCOM_PHY=m ## CONFIG_PLIP=m -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 449788f49..e7b6ca030 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -754,11 +754,6 @@ CONFIG_BROADCOM_PHY=m ## CONFIG_PLIP=m -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index ac68a40e0..d97e94d6c 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -371,11 +371,6 @@ CONFIG_SMC91X=m ## # CONFIG_PHYLIB is not set -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/pcmcia/Kconfig ## diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 4ff39a62b..47903f2b4 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -424,11 +424,6 @@ CONFIG_SGI_O2MACE_ETH=y ## # CONFIG_PHYLIB is not set -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/parport/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index d147c08ea..11dcdbe84 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -559,11 +559,6 @@ CONFIG_BROADCOM_PHY=y ## # CONFIG_PLIP is not set -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index fd8b09cfc..1de6325d2 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -565,11 +565,6 @@ CONFIG_BROADCOM_PHY=y ## # CONFIG_PLIP is not set -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index f4f058a23..99c447e4e 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -575,11 +575,6 @@ CONFIG_VIA_RHINE=m ## CONFIG_PLIP=m -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 9a8d84ab6..04933a59c 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -381,11 +381,6 @@ CONFIG_SKFP=m ## CONFIG_PLIP=m -## -## file: drivers/net/tokenring/Kconfig -## -# CONFIG_TR is not set - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/installer/modules/nic-extra-modules b/debian/installer/modules/nic-extra-modules index a408d113d..b9d9c9faf 100644 --- a/debian/installer/modules/nic-extra-modules +++ b/debian/installer/modules/nic-extra-modules @@ -1,7 +1,6 @@ # Note that this is an incomplete list that tries to be a common subset # that is right for most kernels. Suppliment with any others. 82596 ? -abyss ? ac3200 ? amd8111e ? at1700 ? @@ -17,11 +16,9 @@ forcedeth ? hamachi hp-plus ? hp100 ? -ibmtr ? igb ipg ? lance ? -lanstreamer ? lne390 ? lp486e ? ne ? @@ -37,7 +34,6 @@ sky2 skge smc-ultra ? tlan ? -tmspci ? typhoon yellowfin 3c501 ? @@ -48,7 +44,6 @@ yellowfin 3c515 ? 3c523 ? 3c527 ? -3c359 ? 8139cp eexpress ? epic100 @@ -61,7 +56,6 @@ smc-ultra32 ? smc9194 ? starfire sundance -olympic arlan ? de2104x ? de600 ? diff --git a/debian/installer/modules/nic-pcmcia-modules b/debian/installer/modules/nic-pcmcia-modules index 414d132a1..50334744d 100644 --- a/debian/installer/modules/nic-pcmcia-modules +++ b/debian/installer/modules/nic-pcmcia-modules @@ -6,7 +6,6 @@ axnet_cs b44 ? com20020_cs ? fmvj18x_cs ? -ibmtr_cs ? netwave_cs ? nmclan_cs orinoco_cs diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-extra-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-extra-modules index 0beb9b1d1..9a58d1c7d 100644 --- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-extra-modules +++ b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-extra-modules @@ -7,12 +7,6 @@ r8169 s2io starfire tlan -3c359 ? -abyss -lanstreamer -olympic -tms380tr -tmspci de2104x dmfe winbond-840 diff --git a/debian/installer/powerpc/modules/powerpc/nic-extra-modules b/debian/installer/powerpc/modules/powerpc/nic-extra-modules index 071e7b286..75e2d7810 100644 --- a/debian/installer/powerpc/modules/powerpc/nic-extra-modules +++ b/debian/installer/powerpc/modules/powerpc/nic-extra-modules @@ -1,3 +1 @@ #include - -tms380tr diff --git a/debian/installer/ppc64/modules/ppc64/nic-extra-modules b/debian/installer/ppc64/modules/ppc64/nic-extra-modules index 8eabd9107..2a8a5ca5d 100644 --- a/debian/installer/ppc64/modules/ppc64/nic-extra-modules +++ b/debian/installer/ppc64/modules/ppc64/nic-extra-modules @@ -1,4 +1,3 @@ #include -tms380tr ehea ps3_gelic