Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4

[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / xilinx_intc.c

diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c
index c2f17cc43dfa4d69a40d131e53a92d2e3acd8688..b7aefd0d45cb20204d7e95b81240564e0cc1ba69 100644 (file)
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
@@ -107,7 +107,7 @@ xilinx_intc_init(struct device_node *np)
        }
        regs = ioremap(res.start, 32);
 
-       printk(KERN_INFO "Xilinx intc at 0x%08X mapped to 0x%p\n",
+       printk(KERN_INFO "Xilinx intc at 0x%08LX mapped to 0x%p\n",
                res.start, regs);
 
        /* Setup interrupt controller */
@@ -135,10 +135,16 @@ void __init xilinx_intc_init_tree(void)
        struct device_node *np;
 
        /* find top level interrupt controller */
-       for_each_compatible_node(np, NULL, "xilinx,intc") {
+       for_each_compatible_node(np, NULL, "xlnx,opb-intc-1.00.c") {
                if (!of_get_property(np, "interrupts", NULL))
                        break;
        }
+       if (!np) {
+               for_each_compatible_node(np, NULL, "xlnx,xps-intc-1.00.a") {
+                       if (!of_get_property(np, "interrupts", NULL))
+                               break;
+               }
+       }
 
        /* xilinx interrupt controller needs to be top level */
        BUG_ON(!np);