mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-13 14:24:11 +08:00
[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>
This commit is contained in:
parent
5bc6b68a10
commit
89b39f5d8d
@ -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
|
||||
|
@ -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 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user