summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-02-26 14:36:27 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-02-26 14:36:27 +0000
commitddc24aa87ea2f11859e9e56a64210d5a268dbee8 (patch)
tree2613d2f6c1b3436cb96cb4f37a6de14b1242a2bd /target/linux
parent22019b182c39d9c5deff043264a60bfc08443668 (diff)
correct wrong CONFIG_PCMCIA defaults (fixes buildbot errors)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6390 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/atheros-2.6/config/default1
-rw-r--r--target/linux/au1000-2.6/config/default1
-rw-r--r--target/linux/brcm-2.6/config/default1
-rw-r--r--target/linux/brcm47xx-2.6/config/default1
-rw-r--r--target/linux/generic-2.6/config-template2
-rw-r--r--target/linux/ixp4xx-2.6/config/default1
-rw-r--r--target/linux/pxa-2.6/config/default1
-rw-r--r--target/linux/rdc-2.6/config/default1
-rw-r--r--target/linux/sibyte-2.6/config/default1
9 files changed, 9 insertions, 1 deletions
diff --git a/target/linux/atheros-2.6/config/default b/target/linux/atheros-2.6/config/default
index 79fc6054e..c7713b040 100644
--- 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 95026a705..b62c3f0fb 100644
--- 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 3aacb19a5..6f829e8b5 100644
--- 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 de147347b..c3609b964 100644
--- 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 b1326347f..6e653716f 100644
--- 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 37133fbcc..933672313 100644
--- 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 4b8aa372f..dcbff874a 100644
--- 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 c9b606652..54c4adbb1 100644
--- 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 ee2c890fe..f5e42f24c 100644
--- 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