correct wrong CONFIG_PCMCIA defaults (fixes buildbot errors)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6390 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/atheros-2.6/config/default b/target/linux/atheros-2.6/config/default
index 79fc605..c7713b0 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 95026a7..b62c3f0 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 3aacb19..6f829e8 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 de14734..c3609b9 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 b132634..6e65371 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 37133fb..9336723 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 4b8aa37..dcbff87 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 c9b6066..54c4adb 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 ee2c890..f5e42f2 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