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

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

diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c
index a216c55bc6ad149be937e92d0fb4a9a92b0933e3..a3dbdc846e037e34202a18b8fce53bdca90b5f52 100644 (file)
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c
@@ -28,6 +28,7 @@
 #include <linux/mtd/doc2000.h>
 #include <watchdog.h>
 #include <pci.h>
+#include <netdev.h>
 
 #include "hardware.h"
 #include "pcippc2.h"
@@ -63,7 +64,7 @@ u32 pcippc2_sdram_size (void)
        return in32 (REG (CPC0, RGBAN1));
 }
 
-long initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        return cpc710_ram_init ();
 }
@@ -202,7 +203,7 @@ void watchdog_reset (void)
                enable_interrupts ();
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#if defined(CONFIG_CMD_BSP)
 int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        switch (argc) {
@@ -241,5 +242,10 @@ U_BOOT_CMD(
        "wd      - print current status\n"
 );
 
-#endif /* CFG_CMD_BSP */
+#endif
 #endif /* CONFIG_WATCHDOG */
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}