[kernel] r12696 - in dists/trunk/linux-2.6/debian: . config config/i386 config/powerpc

[Maximilian Attems]

Author: maks
Date: Fri Feb  6 13:35:27 2009
New Revision: 12696

Log:
topconfig enable PCMCIA_IBMTR

"For whatever value of 'OK' can be applied to the use of token ring"
64 bit clean, see dc976c09da4e13b2b3fda23cca9d0682d1de7213

nuke duplicate enabling in x86_32 and ppc.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/powerpc/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Feb  6 13:35:27 2009
@@ -39,7 +39,7 @@
     UIO_SERCOS3, CORE_DUMP_DEFAULT_ELF_HEADERS, NET_DSA, NET_DSA_MV88E6060,
     NET_DSA_MV88E6131, NET_DSA_MV88E6123_61_65, IT87_WDT,
     BACKLIGHT_MBP_NVIDIA, SND_HDA_INPUT_BEEP, USB_WUSB, USB_TMC, IDE_GD,
-    IDE_GD_ATA, IDE_GD_ATAPI.
+    IDE_GD_ATA, IDE_GD_ATAPI, PCMCIA_IBMTR.
   * [x86] set MOUSE_BCM5974, X86_RESERVE_LOW_64K, OPROFILE_IBS,
     MICROCODE_INTEL, MICROCODE_AMD.
   * [x86_64] set AMD_IOMMU, MTRR_SANITIZER, DMAR, DMAR_GFX_WA,

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Feb  6 13:35:27 2009
@@ -1220,6 +1220,11 @@
 CONFIG_MCS_FIR=m
 
 ##
+## file: drivers/net/pcmcia/Kconfig
+##
+CONFIG_PCMCIA_IBMTR=m
+
+##
 ## file: drivers/net/phy/Kconfig
 ##
 CONFIG_PHYLIB=m

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Fri Feb  6 13:35:27 2009
@@ -1210,7 +1210,6 @@
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_AXNET=m
 CONFIG_ARCNET_COM20020_CS=m
-CONFIG_PCMCIA_IBMTR=m
 
 ##
 ## file: drivers/net/tulip/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Fri Feb  6 13:35:27 2009
@@ -660,7 +660,6 @@
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_AXNET=m
 CONFIG_ARCNET_COM20020_CS=m
-CONFIG_PCMCIA_IBMTR=m
 
 ##
 ## file: drivers/net/tulip/Kconfig