Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / arch / microblaze / kernel / intc.c

diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index e1cf081..d61ea33 100644 (file)
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -128,9 +128,6 @@ void __init init_IRQ(void)
 #endif
        const char * const intc_list[] = {
                                "xlnx,xps-intc-1.00.a",
-                               "xlnx,opb-intc-1.00.c",
-                               "xlnx,opb-intc-1.00.b",
-                               "xlnx,opb-intc-1.00.a",
                                NULL
                        };
 
@@ -141,12 +138,15 @@ void __init init_IRQ(void)
        }
        BUG_ON(!intc);
 
-       intc_baseaddr = *(int *) of_get_property(intc, "reg", NULL);
+       intc_baseaddr = be32_to_cpup(of_get_property(intc,
+                                                               "reg", NULL));
        intc_baseaddr = (unsigned long) ioremap(intc_baseaddr, PAGE_SIZE);
-       nr_irq = *(int *) of_get_property(intc, "xlnx,num-intr-inputs", NULL);
+       nr_irq = be32_to_cpup(of_get_property(intc,
+                                               "xlnx,num-intr-inputs", NULL));
 
        intr_type =
-               *(int *) of_get_property(intc, "xlnx,kind-of-intr", NULL);
+               be32_to_cpup(of_get_property(intc,
+                                               "xlnx,kind-of-intr", NULL));
        if (intr_type >= (1 << (nr_irq + 1)))
                printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n");