Correction patch

[oweals/u-boot.git] / board / genietv / genietv.c

diff --git a/board/genietv/genietv.c b/board/genietv/genietv.c
index c19841ae792a76601ca4738a43a200a5a37937e8..c75507f61d4167b046742e7004ffe164ce4ffd73 100644 (file)
--- a/board/genietv/genietv.c
+++ b/board/genietv/genietv.c
@@ -187,14 +187,14 @@ long int initdram (int board_type)
        PrintState ();
 #endif
 /*    printf ("\nChecking bank1..."); */
-       size8 = dram_size (CFG_MBMR_8COL, (ulong *) SDRAM_BASE1_PRELIM,
+       size8 = dram_size (CFG_MBMR_8COL, (long *) SDRAM_BASE1_PRELIM,
                           SDRAM_MAX_SIZE);
 
        size_b0 = size8;
 
 /*    printf ("\nChecking bank2..."); */
        size_b1 =
-               dram_size (memctl->memc_mbmr, (ulong *) SDRAM_BASE2_PRELIM,
+               dram_size (memctl->memc_mbmr, (long *) SDRAM_BASE2_PRELIM,
                           SDRAM_MAX_SIZE);
 
        /*
@@ -267,7 +267,7 @@ static long int dram_size (long int mbmr_value, long int *base,
        return (size);
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if defined(CONFIG_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