git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
drivers
/
pcmcia
/
Kconfig
diff --git
a/drivers/pcmcia/Kconfig
b/drivers/pcmcia/Kconfig
index
1f4ad0e
..
35f8864
100644
(file)
--- a/
drivers/pcmcia/Kconfig
+++ b/
drivers/pcmcia/Kconfig
@@
-6,7
+6,7
@@
menu "PCCARD (PCMCIA/CardBus) support"
config PCCARD
tristate "PCCard (PCMCIA/CardBus) support"
config PCCARD
tristate "PCCard (PCMCIA/CardBus) support"
-
select
HOTPLUG
+
depends on
HOTPLUG
---help---
Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
computer. These are credit-card size devices such as network cards,
---help---
Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
computer. These are credit-card size devices such as network cards,
@@
-250,7
+250,7
@@
config M32R_CFC_NUM
config PCMCIA_VRC4171
tristate "NEC VRC4171 Card Controllers support"
config PCMCIA_VRC4171
tristate "NEC VRC4171 Card Controllers support"
- depends on
VRC4171
&& PCMCIA
+ depends on
CPU_VR41XX && ISA
&& PCMCIA
config PCMCIA_VRC4173
tristate "NEC VRC4173 CARDU support"
config PCMCIA_VRC4173
tristate "NEC VRC4173 CARDU support"
@@
-263,6
+263,13
@@
config OMAP_CF
Say Y here to support the CompactFlash controller on OMAP.
Note that this doesn't support "True IDE" mode.
Say Y here to support the CompactFlash controller on OMAP.
Note that this doesn't support "True IDE" mode.
+config AT91_CF
+ tristate "AT91 CompactFlash Controller"
+ depends on PCMCIA && ARCH_AT91RM9200
+ help
+ Say Y here to support the CompactFlash controller on AT91 chips.
+ Or choose M to compile the driver as a module named "at91_cf".
+
config PCCARD_NONSTATIC
tristate
config PCCARD_NONSTATIC
tristate