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]
/
board
/
genietv
/
genietv.c
diff --git
a/board/genietv/genietv.c
b/board/genietv/genietv.c
index
5f8c899
..
c75507f
100644
(file)
--- a/
board/genietv/genietv.c
+++ b/
board/genietv/genietv.c
@@
-267,7
+267,7
@@
static long int dram_size (long int mbmr_value, long int *base,
return (size);
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_PCMCIA)
+#if
defined(CONFI
G_CMD_PCMCIA)
#ifdef CFG_PCMCIA_MEM_ADDR
volatile unsigned char *pcmcia_mem = (unsigned char *) CFG_PCMCIA_MEM_ADDR;
@@
-357,4
+357,4
@@
int pcmcia_init (void)
return 0;
}
-#endif
/* CFG_CMD_PCMCIA */
+#endif