Merge branch 'master' of git://git.denx.de/u-boot-arm

[oweals/u-boot.git] / board / ronetix / pm9261 / pm9261.c

diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index 46948546ae207ef9fe04286a77a363b3f2761f43..8662339581fd1abd32eecce4c74ff5727ce585e2 100644 (file)
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -189,7 +189,7 @@ void lcd_show_board_info(void)
        lcd_printf ("(C) 2009 Ronetix GmbH\n");
        lcd_printf ("support@ronetix.at\n");
        lcd_printf ("%s CPU at %s MHz",
-               AT91_CPU_NAME,
+               CONFIG_SYS_AT91_CPU_NAME,
                strmhz(temp, get_cpu_clk_rate()));
 
        dram_size = 0;
@@ -250,6 +250,13 @@ int board_init(void)
        return 0;
 }
 
+#ifdef CONFIG_DRIVER_DM9000
+int board_eth_init(bd_t *bis)
+{
+       return dm9000_initialize(bis);
+}
+#endif
+
 int dram_init(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM;