fix pcmcia/pccard build defaults

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7275 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-19 16:16:48 +00:00 · 2007-05-19 16:16:48 +00:00 · ae8db89239
parent 95f33bb59d
commit ae8db89239
4 changed files with 5 additions and 3 deletions
--- 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),)
--- 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
--- 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
--- 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