projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
[deliverable/linux.git]
/
drivers
/
pcmcia
/
ti113x.h
diff --git
a/drivers/pcmcia/ti113x.h
b/drivers/pcmcia/ti113x.h
index c7ba99871aca05ef2d51f9e5fdd43144c60bd544..fbe233e19cebb285d620363c42d730b32c5a729b 100644
(file)
--- 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 */
This page took
0.024731 seconds
and
5
git commands to generate.