git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[pandora-kernel.git]
/
drivers
/
pcmcia
/
ti113x.h
diff --git
a/drivers/pcmcia/ti113x.h
b/drivers/pcmcia/ti113x.h
index
539b5cd
..
62e9ebf
100644
(file)
--- a/
drivers/pcmcia/ti113x.h
+++ b/
drivers/pcmcia/ti113x.h
@@
-30,7
+30,6
@@
#ifndef _LINUX_TI113X_H
#define _LINUX_TI113X_H
#ifndef _LINUX_TI113X_H
#define _LINUX_TI113X_H
-#include <linux/config.h>
/* Register definitions for TI 113X PCI-to-CardBus bridges */
/* Register definitions for TI 113X PCI-to-CardBus bridges */
@@
-648,6
+647,7
@@
static int ti12xx_2nd_slot_empty(struct yenta_socket *socket)
*/
break;
*/
break;
+ case PCI_DEVICE_ID_TI_XX12:
case PCI_DEVICE_ID_TI_X515:
case PCI_DEVICE_ID_TI_X420:
case PCI_DEVICE_ID_TI_X620:
case PCI_DEVICE_ID_TI_X515:
case PCI_DEVICE_ID_TI_X420:
case PCI_DEVICE_ID_TI_X620:
@@
-873,7
+873,7
@@
static int ti1250_override(struct yenta_socket *socket)
* Some fixup code to make everybody happy (TM).
*/
* Some fixup code to make everybody happy (TM).
*/
-#ifdef CONFIG_
CARDBUS
+#ifdef CONFIG_
YENTA_ENE_TUNE
/**
* set/clear various test bits:
* Defaults to clear the bit.
/**
* set/clear various test bits:
* Defaults to clear the bit.
@@
-937,7
+937,7
@@
static int ene_override(struct yenta_socket *socket)
}
#else
# define ene_override ti1250_override
}
#else
# define ene_override ti1250_override
-#endif
+#endif
/* !CONFIG_YENTA_ENE_TUNE */
#endif /* _LINUX_TI113X_H */
#endif /* _LINUX_TI113X_H */