Merge branch 'linus' into core/generic-dma-coherent

[pandora-kernel.git] / arch / powerpc / boot / simpleboot.c

diff --git a/arch/powerpc/boot/simpleboot.c b/arch/powerpc/boot/simpleboot.c
index 86cd285..c58a0da 100644 (file)
--- a/arch/powerpc/boot/simpleboot.c
+++ b/arch/powerpc/boot/simpleboot.c
@@ -23,6 +23,8 @@
 
 BSS_STACK(4*1024);
 
+extern int platform_specific_init(void) __attribute__((weak));
+
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                   unsigned long r6, unsigned long r7)
 {
@@ -80,5 +82,9 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 
        /* prepare the device tree and find the console */
        fdt_init(_dtb_start);
+
+       if (platform_specific_init)
+               platform_specific_init();
+
        serial_console_init();
 }