Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.25

1 files changed, 7 insertions, 1 deletions

diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c
index c2f17cc43dfa..ba8eea2bcce0 100644
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
@@ -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);