[PATCH 9/9] yenta: don't depend on CardBus

[Dominik Brodowski]

As a follow-up, we can allow the yenta-driver to be limited to PCMCIA
operation.

Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>

---

 drivers/pcmcia/Kconfig  |    3 ++-
 drivers/pcmcia/ti113x.h |    4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

Index: 2.6.12-git10/drivers/pcmcia/Kconfig
===================================================================
--- 2.6.12-git10.orig/drivers/pcmcia/Kconfig
+++ 2.6.12-git10/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
Index: 2.6.12-git10/drivers/pcmcia/ti113x.h
===================================================================
--- 2.6.12-git10.orig/drivers/pcmcia/ti113x.h
+++ 2.6.12-git10/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_
 	return ti12xx_override(socket);
 }
 
-#endif /* CONFIG_CARDBUS */
-
 #endif /* _LINUX_TI113X_H */