Merge git://git.denx.de/u-boot

[karo-tx-uboot.git] / board / ti / omap2420h4 / omap2420h4.c

diff --git a/board/ti/omap2420h4/omap2420h4.c b/board/ti/omap2420h4/omap2420h4.c
index 1c98e1b82ae1a7fa1ce1e7ba5e06f6f7bf8f7528..188e4acc0998cf9fd8247dc79aecc2a94148e206 100644 (file)
--- a/board/ti/omap2420h4/omap2420h4.c
+++ b/board/ti/omap2420h4/omap2420h4.c
@@ -153,7 +153,7 @@ void wait_for_command_complete(unsigned int wd_base)
  ******************************************************************/
 void ether_init (void)
 {
-#ifdef CONFIG_DRIVER_LAN91C96
+#ifdef CONFIG_LAN91C96
        int cnt = 20;
 
        __raw_writeb(0x3,OMAP2420_CTRL_BASE+0x10a); /*protect->gpio95 */
@@ -193,7 +193,7 @@ void ether_init (void)
 int dram_init (void)
 {
        unsigned int size0=0,size1=0;
-       u32 mtype, btype, rev, cpu;
+       u32 mtype, btype, rev;
        u8 chg_on = 0x5; /* enable charge of back up battery */
        u8 vmode_on = 0x8C;
        #define NOT_EARLY 0
@@ -203,7 +203,6 @@ int dram_init (void)
        btype = get_board_type();
        mtype = get_mem_type();
        rev = get_cpu_rev();
-       cpu = get_cpu_type();
 
        display_board_info(btype);
        if (btype == BOARD_H4_MENELAUS){