aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros-2.6
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-01-11 18:47:44 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-01-11 18:47:44 +0000
commit76722ae538e879972f9a2bcfbd31d6c7fc3d4163 (patch)
tree69f1b8a84f0b3d1091cf7f764954a0bd980387b0 /target/linux/atheros-2.6
parent4b7c21055560866298bc9116c8dd2ebda9108a85 (diff)
downloadupstream-76722ae538e879972f9a2bcfbd31d6c7fc3d4163.tar.gz
upstream-76722ae538e879972f9a2bcfbd31d6c7fc3d4163.tar.bz2
upstream-76722ae538e879972f9a2bcfbd31d6c7fc3d4163.zip
disable pcmcia for atheros-2.6
SVN-Revision: 6082
Diffstat (limited to 'target/linux/atheros-2.6')
-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 fede432f8d..7405e715bb 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 9ab17e56fc..30c500e847 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