correct wrong CONFIG_PCMCIA defaults (fixes buildbot errors)
SVN-Revision: 6390
This commit is contained in:
parent
d5c4dc7002
commit
c6a4f047e3
@ -154,6 +154,7 @@ CONFIG_MTD_SPLIT_ROOTFS=y
|
||||
CONFIG_PAGE_SIZE_4KB=y
|
||||
# CONFIG_PAGE_SIZE_64KB is not set
|
||||
# CONFIG_PAGE_SIZE_8KB is not set
|
||||
# CONFIG_PCMCIA is not set
|
||||
# CONFIG_PCCARD is not set
|
||||
# CONFIG_PMC_YOSEMITE is not set
|
||||
# CONFIG_PNX8550_JBS is not set
|
||||
|
@ -187,6 +187,7 @@ CONFIG_MTX1_WATCHDOG=y
|
||||
CONFIG_PAGE_SIZE_4KB=y
|
||||
# CONFIG_PAGE_SIZE_64KB is not set
|
||||
# CONFIG_PAGE_SIZE_8KB is not set
|
||||
# CONFIG_PCMCIA is not set
|
||||
# CONFIG_PCCARD is not set
|
||||
# CONFIG_PCIPCWATCHDOG is not set
|
||||
CONFIG_PHYLIB=y
|
||||
|
@ -221,6 +221,7 @@ CONFIG_MTD_PARTITIONS=y
|
||||
CONFIG_PAGE_SIZE_4KB=y
|
||||
# CONFIG_PAGE_SIZE_64KB is not set
|
||||
# CONFIG_PAGE_SIZE_8KB is not set
|
||||
CONFIG_PCMCIA=m
|
||||
# CONFIG_PMC_YOSEMITE is not set
|
||||
# CONFIG_PNX8550_JBS is not set
|
||||
# CONFIG_PNX8550_V2PCI is not set
|
||||
|
@ -223,6 +223,7 @@ CONFIG_MTD_PARTITIONS=y
|
||||
CONFIG_PAGE_SIZE_4KB=y
|
||||
# CONFIG_PAGE_SIZE_64KB is not set
|
||||
# CONFIG_PAGE_SIZE_8KB is not set
|
||||
# CONFIG_PCMCIA is not set
|
||||
# CONFIG_PMC_YOSEMITE is not set
|
||||
# CONFIG_PNX8550_JBS is not set
|
||||
# CONFIG_PNX8550_V2PCI is not set
|
||||
|
@ -728,7 +728,7 @@ CONFIG_PCCARD_NONSTATIC=m
|
||||
CONFIG_PCI=y
|
||||
CONFIG_PCI_ATMEL=m
|
||||
CONFIG_PCI_HERMES=m
|
||||
CONFIG_PCMCIA=m
|
||||
# CONFIG_PCMCIA is not set
|
||||
# CONFIG_PCMCIA_AHA152X is not set
|
||||
# CONFIG_PCMCIA_DEBUG is not set
|
||||
# CONFIG_PCMCIA_FDOMAIN is not set
|
||||
|
@ -331,6 +331,7 @@ CONFIG_PATA_ARTOP=m
|
||||
# CONFIG_PATA_VIA is not set
|
||||
# CONFIG_PATA_WINBOND is not set
|
||||
# CONFIG_PC300 is not set
|
||||
# CONFIG_PCMCIA is not set
|
||||
# CONFIG_PCCARD is not set
|
||||
# CONFIG_PCI200SYN is not set
|
||||
# CONFIG_PCIPCWATCHDOG is not set
|
||||
|
@ -295,6 +295,7 @@ CONFIG_NET_DIVERT=y
|
||||
# CONFIG_NVRAM is not set
|
||||
CONFIG_OBSOLETE_INTERMODULE=y
|
||||
# CONFIG_PARTITION_ADVANCED is not set
|
||||
# CONFIG_PCMCIA is not set
|
||||
# CONFIG_PCCARD is not set
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_DEBUG is not set
|
||||
|
@ -282,6 +282,7 @@ CONFIG_NOHIGHMEM=y
|
||||
CONFIG_PAGE_OFFSET=0xC0000000
|
||||
# CONFIG_PARTITION_ADVANCED is not set
|
||||
# CONFIG_PC8736x_GPIO is not set
|
||||
# CONFIG_PCMCIA is not set
|
||||
# CONFIG_PCCARD is not set
|
||||
# CONFIG_PCIEPORTBUS is not set
|
||||
# CONFIG_PCIPCWATCHDOG is not set
|
||||
|
@ -249,6 +249,7 @@ CONFIG_OBSOLETE_MODPARM=y
|
||||
CONFIG_PAGE_SIZE_4KB=y
|
||||
# CONFIG_PAGE_SIZE_64KB is not set
|
||||
# CONFIG_PAGE_SIZE_8KB is not set
|
||||
# CONFIG_PCMCIA is not set
|
||||
# CONFIG_PCCARD is not set
|
||||
# CONFIG_PCI_LEGACY_PROC is not set
|
||||
# CONFIG_PMC_YOSEMITE is not set
|
||||
|
Loading…
Reference in New Issue
Block a user