Subject: powerpc: fix mpic/axon patch

Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>

Index: linux-2.6/arch/powerpc/platforms/cell/setup.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/cell/setup.c
+++ linux-2.6/arch/powerpc/platforms/cell/setup.c
@@ -109,7 +109,7 @@ static void __init mpic_init_IRQ(void)
 	unsigned int virq;
 	unsigned long mpic_addr = 0;
 	int chip = 0;
-	u32 *res;
+	const u32 *res;
 
 	/* XXX node numbers are totally bogus. We _hope_ we get the device
 	 * nodes in the right order here but that's definitely not guaranteed,
Index: linux-2.6/arch/powerpc/sysdev/mpic.c
===================================================================
--- linux-2.6.orig/arch/powerpc/sysdev/mpic.c
+++ linux-2.6/arch/powerpc/sysdev/mpic.c
@@ -36,6 +36,7 @@
 #include <asm/machdep.h>
 #include <asm/mpic.h>
 #include <asm/smp.h>
+#include <asm/udbg.h>
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)