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. svn path=/dists/trunk/linux-2.6/; revision=12696
This commit is contained in:
parent
99119d5caf
commit
4e92090142
|
@ -39,7 +39,7 @@ linux-2.6 (2.6.28-1~experimental.1) UNRELEASED; urgency=low
|
|||
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,
|
||||
|
|
|
@ -1219,6 +1219,11 @@ CONFIG_KSDAZZLE_DONGLE=m
|
|||
CONFIG_KS959_DONGLE=m
|
||||
CONFIG_MCS_FIR=m
|
||||
|
||||
##
|
||||
## file: drivers/net/pcmcia/Kconfig
|
||||
##
|
||||
CONFIG_PCMCIA_IBMTR=m
|
||||
|
||||
##
|
||||
## file: drivers/net/phy/Kconfig
|
||||
##
|
||||
|
|
|
@ -1210,7 +1210,6 @@ CONFIG_PCMCIA_SMC91C92=m
|
|||
CONFIG_PCMCIA_XIRC2PS=m
|
||||
CONFIG_PCMCIA_AXNET=m
|
||||
CONFIG_ARCNET_COM20020_CS=m
|
||||
CONFIG_PCMCIA_IBMTR=m
|
||||
|
||||
##
|
||||
## file: drivers/net/tulip/Kconfig
|
||||
|
|
|
@ -660,7 +660,6 @@ CONFIG_PCMCIA_SMC91C92=m
|
|||
CONFIG_PCMCIA_XIRC2PS=m
|
||||
CONFIG_PCMCIA_AXNET=m
|
||||
CONFIG_ARCNET_COM20020_CS=m
|
||||
CONFIG_PCMCIA_IBMTR=m
|
||||
|
||||
##
|
||||
## file: drivers/net/tulip/Kconfig
|
||||
|
|
Loading…
Reference in New Issue