Merge branch 'fixes' into cleanups

[karo-tx-uboot.git] / board / sc520_spunk / sc520_spunk.c

diff --git a/board/sc520_spunk/sc520_spunk.c b/board/sc520_spunk/sc520_spunk.c
index 038d4799535393c5c22b6967a7e222914d7919d4..d3bd869306575450de6f3f6e0762ff7aa87a8fac 100644 (file)
--- a/board/sc520_spunk/sc520_spunk.c
+++ b/board/sc520_spunk/sc520_spunk.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <pci.h>
 #include <ssi.h>
+#include <netdev.h>
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <asm/ic/sc520.h>
@@ -104,10 +105,10 @@ static void pci_sc520_spunk_fixup_irq(struct pci_controller *hose, pci_dev_t dev
         * when we need one (a board with more pci interrupt pins
         * would use a larger table */
        static int irq_list[] = {
-               CFG_FIRST_PCI_IRQ,
-               CFG_SECOND_PCI_IRQ,
-               CFG_THIRD_PCI_IRQ,
-               CFG_FORTH_PCI_IRQ
+               CONFIG_SYS_FIRST_PCI_IRQ,
+               CONFIG_SYS_SECOND_PCI_IRQ,
+               CONFIG_SYS_THIRD_PCI_IRQ,
+               CONFIG_SYS_FORTH_PCI_IRQ
        };
        static int next_irq_index=0;
 
@@ -676,3 +677,8 @@ ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len)
                spi_eeprom_write(1, offset, buffer, len) :
        mw_eeprom_write(1, offset, buffer, len);
 }
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}