summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-19 16:16:48 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-19 16:16:48 +0000
commit74263c7c570c1b703d32deb6bdc3e45875455716 (patch)
tree2463f9967d82e0693af879636302c8042edbdaed
parent49f869938d77de2bedcf653a248198cd961fb7a3 (diff)
fix pcmcia/pccard build defaults
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7275 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel-build.mk2
-rw-r--r--target/linux/brcm-2.4/config/default2
-rw-r--r--target/linux/generic-2.6/config-template2
-rw-r--r--target/linux/x86-2.6/config/default2
4 files changed, 5 insertions, 3 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 9037b5ced..e3c532cd1 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -25,7 +25,7 @@ endif
ifneq ($(CONFIG_USB),)
FEATURES += usb
endif
-ifneq ($(CONFIG_PCMCIA),)
+ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
FEATURES += pcmcia
endif
ifneq ($(CONFIG_VIDEO_DEV),)
diff --git a/target/linux/brcm-2.4/config/default b/target/linux/brcm-2.4/config/default
index 282817016..9039acf82 100644
--- a/target/linux/brcm-2.4/config/default
+++ b/target/linux/brcm-2.4/config/default
@@ -195,6 +195,8 @@ CONFIG_PARPORT=m
# CONFIG_PARPORT_PC is not set
CONFIG_PARPORT_SPLINK=m
# CONFIG_PARPORT_SUNBPP is not set
+CONFIG_PCCARD=m
+CONFIG_PCCARD_NONSTATIC=m
CONFIG_PCI=y
CONFIG_PCI_AUTO=y
# CONFIG_PCI_HERMES is not set
diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template
index a35715eca..9fdab70e2 100644
--- a/target/linux/generic-2.6/config-template
+++ b/target/linux/generic-2.6/config-template
@@ -739,8 +739,6 @@ CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
# CONFIG_PARPORT is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PCCARD=m
-CONFIG_PCCARD_NONSTATIC=m
CONFIG_PCI=y
CONFIG_PCI_ATMEL=m
CONFIG_PCI_HERMES=m
diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86-2.6/config/default
index 07219c141..8029d5a0b 100644
--- a/target/linux/x86-2.6/config/default
+++ b/target/linux/x86-2.6/config/default
@@ -337,6 +337,8 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
CONFIG_PC8736x_GPIO=m
+CONFIG_PCCARD=m
+CONFIG_PCCARD_NONSTATIC=m
# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_BIOS=y