diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-07-07 17:59:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 18:24:07 -0700 |
| commit | 89b39f5d8d701ddd93546b3d8edbefa5d568529d (patch) | |
| tree | bdb87ecd1d0b659f8e6c54486f2ec9c71ba0cf31 | |
| parent | 5bc6b68a103a6f4055890b5127ddca3a322751b0 (diff) | |
| download | blackbird-op-linux-89b39f5d8d701ddd93546b3d8edbefa5d568529d.tar.gz blackbird-op-linux-89b39f5d8d701ddd93546b3d8edbefa5d568529d.zip | |
[PATCH] yenta: don't depend on CardBus
As a follow-up, we can allow the yenta-driver to be limited to PCMCIA
operation.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/pcmcia/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/pcmcia/ti113x.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index bb4dd2735d70..6485f75d2fb3 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -102,7 +102,8 @@ comment "PC-card bridges" config YENTA tristate "CardBus yenta-compatible bridge support" - depends on CARDBUS + depends on PCI + select CARDBUS if !EMBEDDED select PCCARD_NONSTATIC ---help--- This option enables support for CardBus host bridges. Virtually diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h index c7ba99871aca..fbe233e19ceb 100644 --- a/drivers/pcmcia/ti113x.h +++ b/drivers/pcmcia/ti113x.h @@ -154,8 +154,6 @@ #define ENE_TEST_C9 0xc9 /* 8bit */ #define ENE_TEST_C9_TLTENABLE 0x02 -#ifdef CONFIG_CARDBUS - /* * Texas Instruments CardBus controller overrides. */ @@ -843,7 +841,5 @@ static int ti1250_override(struct yenta_socket *socket) return ti12xx_override(socket); } -#endif /* CONFIG_CARDBUS */ - #endif /* _LINUX_TI113X_H */ |
