projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
940b1f3
)
fix pcmcia/pccard build defaults
author
Felix Fietkau
<nbd@openwrt.org>
Sat, 19 May 2007 16:16:48 +0000
(16:16 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sat, 19 May 2007 16:16:48 +0000
(16:16 +0000)
SVN-Revision: 7275
include/kernel-build.mk
patch
|
blob
|
history
target/linux/brcm-2.4/config/default
patch
|
blob
|
history
target/linux/generic-2.6/config-template
patch
|
blob
|
history
target/linux/x86-2.6/config/default
patch
|
blob
|
history
diff --git
a/include/kernel-build.mk
b/include/kernel-build.mk
index 9037b5ced043ccc656769cdce0a17122290e4c53..e3c532cd1d7c3f73d64127b8635257ee780d6109 100644
(file)
--- a/
include/kernel-build.mk
+++ b/
include/kernel-build.mk
@@
-25,7
+25,7
@@
endif
ifneq ($(CONFIG_USB),)
FEATURES += usb
endif
ifneq ($(CONFIG_USB),)
FEATURES += usb
endif
-ifneq ($(CONFIG_PCMCIA),)
+ifneq ($(CONFIG_PCMCIA)
$(CONFIG_PCCARD)
,)
FEATURES += pcmcia
endif
ifneq ($(CONFIG_VIDEO_DEV),)
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 2828170162953332fd8755b2453a308aa4db0d48..9039acf82d92ac120f01973a6d5140ada45361e1 100644
(file)
--- 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_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
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 a35715eca99789a5f8df9937720143920fa93897..9fdab70e2a98e7f7fcedb860319094b06607dcd1 100644
(file)
--- 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_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
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 07219c1411e8b251e5df96ab4cec10df7b11527f..8029d5a0b45f78f6d07dda6359f0b45ad7875a93 100644
(file)
--- 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_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
# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_BIOS=y