projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
drivers
/
ti_pci1410a.c
diff --git
a/drivers/ti_pci1410a.c
b/drivers/ti_pci1410a.c
index
d5808e5
..
208ca50
100644
(file)
--- a/
drivers/ti_pci1410a.c
+++ b/
drivers/ti_pci1410a.c
@@
-64,7
+64,7
@@
#include <pcmcia.h>
-#if
((CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
) && defined(CONFIG_IDE_TI_CARDBUS)
+#if
defined(CONFIG_CMD_PCMCIA
) && defined(CONFIG_IDE_TI_CARDBUS)
int pcmcia_on(int ide_base_bus);