diff options
| author | Todd Poynor <tpoynor@mvista.com> | 2005-07-12 03:34:39 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-13 00:58:44 +0200 |
| commit | a98a5d04f400ad112e59cadd739dbabf89417e60 (patch) | |
| tree | 5eeb7f45c0090de40c7523e2b9dfd5e86b22169e /drivers/pcmcia/ti113x.h | |
| parent | 751382dd5cb2702368d281a50b55c2d6c4e8fbfc (diff) | |
| parent | 7ac3db59fd4410405ce55e2a25c397aec440d8da (diff) | |
| download | talos-op-linux-a98a5d04f400ad112e59cadd739dbabf89417e60.tar.gz talos-op-linux-a98a5d04f400ad112e59cadd739dbabf89417e60.zip | |
Merge with rsync://fileserver/linux
Diffstat (limited to 'drivers/pcmcia/ti113x.h')
| -rw-r--r-- | drivers/pcmcia/ti113x.h | 4 |
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 @@ #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 */ |
