projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
[oweals/u-boot.git]
/
drivers
/
pcmcia
/
ti_pci1410a.c
diff --git
a/drivers/pcmcia/ti_pci1410a.c
b/drivers/pcmcia/ti_pci1410a.c
index 208ca50a743ecb88b56ab8daa6665f85d19ee65f..c876d0c402556126d2953af71f30ac35b297be51 100644
(file)
--- a/
drivers/pcmcia/ti_pci1410a.c
+++ b/
drivers/pcmcia/ti_pci1410a.c
@@
-64,7
+64,7
@@
#include <pcmcia.h>
#include <pcmcia.h>
-#if defined(CONFIG_CMD_PCMCIA)
&& defined(CONFIG_IDE_TI_CARDBUS)
+#if defined(CONFIG_CMD_PCMCIA)
int pcmcia_on(int ide_base_bus);
int pcmcia_on(int ide_base_bus);
@@
-662,4
+662,4
@@
static int identify(volatile uchar *p)
return 0; /* don't know */
}
return 0; /* don't know */
}
-#endif /* CONFIG_
IDE_TI_CARDBUS
*/
+#endif /* CONFIG_
CMD_PCMCIA
*/