correct wrong CONFIG_PCMCIA defaults (fixes buildbot errors)

SVN-Revision: 6390

diff --git a/target/linux/atheros-2.6/config/default b/target/linux/atheros-2.6/config/default
index 79fc6054eb6b445786faaedb86005a607f2590a7..c7713b040a42b665ff740aa3a62e9feddbfc5d30 100644 (file)
--- a/target/linux/atheros-2.6/config/default
+++ b/target/linux/atheros-2.6/config/default
@@ -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

diff --git a/target/linux/au1000-2.6/config/default b/target/linux/au1000-2.6/config/default
index 95026a7051560d74cfbe3f604d8c5adf768129ae..b62c3f0fbbd5719c7ef2d4fb34135573808ca00e 100644 (file)
--- a/target/linux/au1000-2.6/config/default
+++ b/target/linux/au1000-2.6/config/default
@@ -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

diff --git a/target/linux/brcm-2.6/config/default b/target/linux/brcm-2.6/config/default
index 3aacb19a5ce0df3d649090b6a05d32eee2e570ed..6f829e8b5c30bc4301448c7ed5395c90eb78fd38 100644 (file)
--- a/target/linux/brcm-2.6/config/default
+++ b/target/linux/brcm-2.6/config/default
@@ -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

diff --git a/target/linux/brcm47xx-2.6/config/default b/target/linux/brcm47xx-2.6/config/default
index de147347b7539ff88fd8c927a8fafb2deed3ed2a..c3609b964c86ae39ffc38f3e45c322581e1f6067 100644 (file)
--- a/target/linux/brcm47xx-2.6/config/default
+++ b/target/linux/brcm47xx-2.6/config/default
@@ -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

diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template
index b1326347faed81d7c8002f062f1317b6f1c6fd43..6e653716f7a299d6f4a02a72c6338643fcdd8256 100644 (file)
--- a/target/linux/generic-2.6/config-template
+++ b/target/linux/generic-2.6/config-template
@@ -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

diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx-2.6/config/default
index 37133fbcc8bd14fe18061486e5bda5b4c2d42145..9336723139b7d8d8e4b69361e8adba03fac8df51 100644 (file)
--- a/target/linux/ixp4xx-2.6/config/default
+++ b/target/linux/ixp4xx-2.6/config/default
@@ -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

diff --git a/target/linux/pxa-2.6/config/default b/target/linux/pxa-2.6/config/default
index 4b8aa372f5d3d46072980f3b34a7addae37e211d..dcbff874af59211ad371b14eb9284f807abdab78 100644 (file)
--- a/target/linux/pxa-2.6/config/default
+++ b/target/linux/pxa-2.6/config/default
@@ -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

diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc-2.6/config/default
index c9b6066520dd4beb8fcc1d02ebe571db9ef5ee2e..54c4adbb146120d0db92624dd1a9aef7c18af08b 100644 (file)
--- a/target/linux/rdc-2.6/config/default
+++ b/target/linux/rdc-2.6/config/default
@@ -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

diff --git a/target/linux/sibyte-2.6/config/default b/target/linux/sibyte-2.6/config/default
index ee2c890feee2a46d94f4ba3f52478dc620052cdb..f5e42f24c9c29c48ff5616d64787561fc58a3e54 100644 (file)
--- a/target/linux/sibyte-2.6/config/default
+++ b/target/linux/sibyte-2.6/config/default
@@ -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