diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-05-19 16:16:48 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-05-19 16:16:48 +0000 |
| commit | ae8db89239a5de8ab0ef3617cc9f7caa1076218b (patch) | |
| tree | 2463f9967d82e0693af879636302c8042edbdaed | |
| parent | 95f33bb59d5bde18978c03bc835fcd2ac7e135c2 (diff) | |
| download | upstream-ae8db89239a5de8ab0ef3617cc9f7caa1076218b.tar.gz upstream-ae8db89239a5de8ab0ef3617cc9f7caa1076218b.tar.bz2 upstream-ae8db89239a5de8ab0ef3617cc9f7caa1076218b.zip | |
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.mk | 2 | ||||
| -rw-r--r-- | target/linux/brcm-2.4/config/default | 2 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-template | 2 | ||||
| -rw-r--r-- | target/linux/x86-2.6/config/default | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 9037b5ced0..e3c532cd1d 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 2828170162..9039acf82d 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 a35715eca9..9fdab70e2a 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 07219c1411..8029d5a0b4 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 |