[kernel] r19296 - in dists/trunk/linux/debian: config config/armel config/hppa config/i386/none config/m68k config/mips config/mipsel config/sparc installer/modules installer/powerpc/modules/powerpc installer/powerpc/modules/powerpc-powerpc-miboot installer/ppc64/modules/ppc64
Ben Hutchings
benh at alioth.debian.org
Fri Jul 27 02:27:18 UTC 2012
Author: benh
Date: Fri Jul 27 02:27:16 2012
New Revision: 19296
Log:
Remove references to Token Ring drivers, removed in Linux 3.5
"it looks like the token got loose"
Modified:
dists/trunk/linux/debian/config/armel/config.iop32x
dists/trunk/linux/debian/config/armel/config.ixp4xx
dists/trunk/linux/debian/config/config
dists/trunk/linux/debian/config/hppa/config
dists/trunk/linux/debian/config/i386/none/config.486
dists/trunk/linux/debian/config/m68k/config.amiga
dists/trunk/linux/debian/config/mips/config.4kc-malta
dists/trunk/linux/debian/config/mips/config.5kc-malta
dists/trunk/linux/debian/config/mips/config.r4k-ip22
dists/trunk/linux/debian/config/mips/config.r5k-ip32
dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux/debian/config/sparc/config
dists/trunk/linux/debian/installer/modules/nic-extra-modules
dists/trunk/linux/debian/installer/modules/nic-pcmcia-modules
dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-extra-modules
dists/trunk/linux/debian/installer/powerpc/modules/powerpc/nic-extra-modules
dists/trunk/linux/debian/installer/ppc64/modules/ppc64/nic-extra-modules
Modified: dists/trunk/linux/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.iop32x Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/armel/config.iop32x Fri Jul 27 02:27:16 2012 (r19296)
@@ -447,11 +447,6 @@
CONFIG_CICADA_PHY=m
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/net/wireless/Kconfig
##
CONFIG_ATMEL=m
Modified: dists/trunk/linux/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.ixp4xx Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/armel/config.ixp4xx Fri Jul 27 02:27:16 2012 (r19296)
@@ -514,11 +514,6 @@
CONFIG_CICADA_PHY=m
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/net/wan/Kconfig
##
# CONFIG_WAN is not set
Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/config Fri Jul 27 02:27:16 2012 (r19296)
@@ -2105,22 +2105,6 @@
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
##
CONFIG_USB_CATC=m
Modified: dists/trunk/linux/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux/debian/config/hppa/config Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/hppa/config Fri Jul 27 02:27:16 2012 (r19296)
@@ -399,11 +399,6 @@
CONFIG_PLIP=m
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/net/wan/Kconfig
##
# CONFIG_WAN is not set
Modified: dists/trunk/linux/debian/config/i386/none/config.486
==============================================================================
--- dists/trunk/linux/debian/config/i386/none/config.486 Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/i386/none/config.486 Fri Jul 27 02:27:16 2012 (r19296)
@@ -94,11 +94,6 @@
CONFIG_DMASCC=m
##
-## file: drivers/net/tokenring/Kconfig
-##
-CONFIG_MADGEMC=m
-
-##
## file: drivers/pci/hotplug/Kconfig
##
CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
Modified: dists/trunk/linux/debian/config/m68k/config.amiga
==============================================================================
--- dists/trunk/linux/debian/config/m68k/config.amiga Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/m68k/config.amiga Fri Jul 27 02:27:16 2012 (r19296)
@@ -175,11 +175,6 @@
CONFIG_PLIP=m
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/parport/Kconfig
##
CONFIG_PARPORT_AMIGA=m
Modified: dists/trunk/linux/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.4kc-malta Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/mips/config.4kc-malta Fri Jul 27 02:27:16 2012 (r19296)
@@ -751,11 +751,6 @@
CONFIG_PLIP=m
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/net/wan/Kconfig
##
# CONFIG_WAN is not set
Modified: dists/trunk/linux/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.5kc-malta Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/mips/config.5kc-malta Fri Jul 27 02:27:16 2012 (r19296)
@@ -755,11 +755,6 @@
CONFIG_PLIP=m
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/net/wan/Kconfig
##
# CONFIG_WAN is not set
Modified: dists/trunk/linux/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.r4k-ip22 Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/mips/config.r4k-ip22 Fri Jul 27 02:27:16 2012 (r19296)
@@ -372,11 +372,6 @@
# CONFIG_PHYLIB is not set
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/pcmcia/Kconfig
##
# CONFIG_PCCARD is not set
Modified: dists/trunk/linux/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.r5k-ip32 Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/mips/config.r5k-ip32 Fri Jul 27 02:27:16 2012 (r19296)
@@ -425,11 +425,6 @@
# CONFIG_PHYLIB is not set
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/parport/Kconfig
##
CONFIG_PARPORT_IP32=m
Modified: dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a Fri Jul 27 02:27:16 2012 (r19296)
@@ -560,11 +560,6 @@
# CONFIG_PLIP is not set
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/net/wan/Kconfig
##
# CONFIG_WAN is not set
Modified: dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b Fri Jul 27 02:27:16 2012 (r19296)
@@ -566,11 +566,6 @@
# CONFIG_PLIP is not set
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/net/wan/Kconfig
##
# CONFIG_WAN is not set
Modified: dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt Fri Jul 27 02:27:16 2012 (r19296)
@@ -576,11 +576,6 @@
CONFIG_PLIP=m
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/net/wan/Kconfig
##
# CONFIG_WAN is not set
Modified: dists/trunk/linux/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux/debian/config/sparc/config Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/config/sparc/config Fri Jul 27 02:27:16 2012 (r19296)
@@ -382,11 +382,6 @@
CONFIG_PLIP=m
##
-## file: drivers/net/tokenring/Kconfig
-##
-# CONFIG_TR is not set
-
-##
## file: drivers/net/wan/Kconfig
##
# CONFIG_WAN is not set
Modified: dists/trunk/linux/debian/installer/modules/nic-extra-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/nic-extra-modules Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/installer/modules/nic-extra-modules Fri Jul 27 02:27:16 2012 (r19296)
@@ -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 @@
hamachi
hp-plus ?
hp100 ?
-ibmtr ?
igb
ipg ?
lance ?
-lanstreamer ?
lne390 ?
lp486e ?
ne ?
@@ -37,7 +34,6 @@
skge
smc-ultra ?
tlan ?
-tmspci ?
typhoon
yellowfin
3c501 ?
@@ -48,7 +44,6 @@
3c515 ?
3c523 ?
3c527 ?
-3c359 ?
8139cp
eexpress ?
epic100
@@ -61,7 +56,6 @@
smc9194 ?
starfire
sundance
-olympic
arlan ?
de2104x ?
de600 ?
Modified: dists/trunk/linux/debian/installer/modules/nic-pcmcia-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/nic-pcmcia-modules Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/installer/modules/nic-pcmcia-modules Fri Jul 27 02:27:16 2012 (r19296)
@@ -6,7 +6,6 @@
b44 ?
com20020_cs ?
fmvj18x_cs ?
-ibmtr_cs ?
netwave_cs ?
nmclan_cs
orinoco_cs
Modified: dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-extra-modules
==============================================================================
--- dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-extra-modules Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-extra-modules Fri Jul 27 02:27:16 2012 (r19296)
@@ -7,12 +7,6 @@
s2io
starfire
tlan
-3c359 ?
-abyss
-lanstreamer
-olympic
-tms380tr
-tmspci
de2104x
dmfe
winbond-840
Modified: dists/trunk/linux/debian/installer/powerpc/modules/powerpc/nic-extra-modules
==============================================================================
--- dists/trunk/linux/debian/installer/powerpc/modules/powerpc/nic-extra-modules Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/installer/powerpc/modules/powerpc/nic-extra-modules Fri Jul 27 02:27:16 2012 (r19296)
@@ -1,3 +1 @@
#include <nic-extra-modules>
-
-tms380tr
Modified: dists/trunk/linux/debian/installer/ppc64/modules/ppc64/nic-extra-modules
==============================================================================
--- dists/trunk/linux/debian/installer/ppc64/modules/ppc64/nic-extra-modules Thu Jul 26 12:38:15 2012 (r19295)
+++ dists/trunk/linux/debian/installer/ppc64/modules/ppc64/nic-extra-modules Fri Jul 27 02:27:16 2012 (r19296)
@@ -1,4 +1,3 @@
#include <nic-extra-modules>
-tms380tr
ehea
ps3_gelic
More information about the Kernel-svn-changes
mailing list