evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] yenta: don't depend on CardBus

Browse source 
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:
Dominik Brodowski 2005-07-07 17:59:09 -07:00 • committed by Linus Torvalds
parent 5bc6b68a10
commit 89b39f5d8d
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/pcmcia/Kconfig
View file

@ -102,7 +102,8 @@ comment "PC-card bridges"
config YENTA config YENTA
tristate "CardBus yenta-compatible bridge support" tristate "CardBus yenta-compatible bridge support"
depends on CARDBUS depends on PCI
select CARDBUS if !EMBEDDED
select PCCARD_NONSTATIC select PCCARD_NONSTATIC
---help--- ---help---
This option enables support for CardBus host bridges. Virtually This option enables support for CardBus host bridges. Virtually

4
drivers/pcmcia/ti113x.h
View file

@ -154,8 +154,6 @@
#define ENE_TEST_C9 0xc9 /* 8bit */ #define ENE_TEST_C9 0xc9 /* 8bit */
#define ENE_TEST_C9_TLTENABLE 0x02 #define ENE_TEST_C9_TLTENABLE 0x02
#ifdef CONFIG_CARDBUS
/* /*
* Texas Instruments CardBus controller overrides. * Texas Instruments CardBus controller overrides.
*/ */
@ -843,7 +841,5 @@ static int ti1250_override(struct yenta_socket *socket)
return ti12xx_override(socket); return ti12xx_override(socket);
} }
#endif /* CONFIG_CARDBUS */
#endif /* _LINUX_TI113X_H */ #endif /* _LINUX_TI113X_H */