pcmcia: fix yenta dependency on PCCARD_NONSTATIC
With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get drivers/built-in.o: In function `yenta_probe': yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' This is because select PCCARD_NONSTATIC if PCMCIA sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' to remove the upper limit. [linux@dominikbrodowski.net: propagate change to PCMICA_M8XX] Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Michal Marek <mmarek@suse.cz> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
parent
3a86e1807a
commit
9d9c98e89e
@ -84,7 +84,7 @@ config YENTA
|
||||
tristate "CardBus yenta-compatible bridge support"
|
||||
depends on PCI
|
||||
select CARDBUS if !EMBEDDED
|
||||
select PCCARD_NONSTATIC if PCMCIA
|
||||
select PCCARD_NONSTATIC if PCMCIA != n
|
||||
---help---
|
||||
This option enables support for CardBus host bridges. Virtually
|
||||
all modern PCMCIA bridges are CardBus compatible. A "bridge" is
|
||||
@ -161,8 +161,8 @@ config TCIC
|
||||
|
||||
config PCMCIA_M8XX
|
||||
tristate "MPC8xx PCMCIA support"
|
||||
depends on PCMCIA && PPC && 8xx
|
||||
select PCCARD_IODYN if PCMCIA
|
||||
depends on PCCARD && PPC && 8xx
|
||||
select PCCARD_IODYN if PCMCIA != n
|
||||
help
|
||||
Say Y here to include support for PowerPC 8xx series PCMCIA
|
||||
controller.
|
||||
|
Loading…
Reference in New Issue
Block a user