aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/ti113x.h
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-07-07 20:59:09 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:24:07 -0400
commit89b39f5d8d701ddd93546b3d8edbefa5d568529d (patch)
treebdb87ecd1d0b659f8e6c54486f2ec9c71ba0cf31 /drivers/pcmcia/ti113x.h
parent5bc6b68a103a6f4055890b5127ddca3a322751b0 (diff)
[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>
Diffstat (limited to 'drivers/pcmcia/ti113x.h')
-rw-r--r--drivers/pcmcia/ti113x.h4
1 files changed, 0 insertions, 4 deletions
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 @@
154#define ENE_TEST_C9 0xc9 /* 8bit */ 154#define ENE_TEST_C9 0xc9 /* 8bit */
155#define ENE_TEST_C9_TLTENABLE 0x02 155#define ENE_TEST_C9_TLTENABLE 0x02
156 156
157#ifdef CONFIG_CARDBUS
158
159/* 157/*
160 * Texas Instruments CardBus controller overrides. 158 * Texas Instruments CardBus controller overrides.
161 */ 159 */
@@ -843,7 +841,5 @@ static int ti1250_override(struct yenta_socket *socket)
843 return ti12xx_override(socket); 841 return ti12xx_override(socket);
844} 842}
845 843
846#endif /* CONFIG_CARDBUS */
847
848#endif /* _LINUX_TI113X_H */ 844#endif /* _LINUX_TI113X_H */
849 845