Add changes from the Linux-2.6 tree.

[linux-2.6.git] / arch / ppc / boot / simple / misc-prep.c

diff --git a/arch/ppc/boot/simple/misc-prep.c b/arch/ppc/boot/simple/misc-prep.c
index da29dec..0086e1c 100644 (file)
--- a/arch/ppc/boot/simple/misc-prep.c
+++ b/arch/ppc/boot/simple/misc-prep.c
@@ -1,12 +1,9 @@
 /*
- * arch/ppc/boot/simple/misc-prep.c
- *
  * Maintainer: Tom Rini <trini@kernel.crashing.org>
  *
  * In the past: Gary Thomas, Cort Dougan <cort@cs.nmt.edu>
  */
 
-#include <linux/config.h>
 #include <linux/pci_ids.h>
 #include <linux/types.h>
 #include <asm/residual.h>
@@ -88,6 +85,7 @@ load_kernel(unsigned long load_addr, int num_words, unsigned long cksum,
                ofinit(OFW_interface);
        }
 
+       board_isa_init();
 #if defined(CONFIG_VGA_CONSOLE)
        vga_init((unsigned char *)0xC0000000);
 #endif /* CONFIG_VGA_CONSOLE */