Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89b39f5d authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds
Browse files

[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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5bc6b68a

drivers/pcmcia/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -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

drivers/pcmcia/ti113x.h

+0 −4
Original line number Diff line number Diff line
@@ -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 */