summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-01-11 18:47:44 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-01-11 18:47:44 +0000
commitcbbc0e61fb6e85acdd158fcfb146a59e48515282 (patch)
tree34bbc26db8d32800078514c498b7abed6b3f8c78
parent39bd320c048f492cee477e2bd819a29918e2a989 (diff)
disable pcmcia for atheros-2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6082 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/atheros-2.6/config2
-rw-r--r--target/linux/atheros-2.6/config-diff1
2 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/atheros-2.6/config b/target/linux/atheros-2.6/config
index fede432f8..7405e715b 100644
--- a/target/linux/atheros-2.6/config
+++ b/target/linux/atheros-2.6/config
@@ -875,7 +875,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/atheros-2.6/config-diff b/target/linux/atheros-2.6/config-diff
index 9ab17e56f..30c500e84 100644
--- a/target/linux/atheros-2.6/config-diff
+++ b/target/linux/atheros-2.6/config-diff
@@ -155,6 +155,7 @@ CONFIG_MTD_SPIFLASH=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