CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK

[sfrench/cifs-2.6.git] / arch / powerpc / sysdev / mv64x60_pic.c

diff --git a/arch/powerpc/sysdev/mv64x60_pic.c b/arch/powerpc/sysdev/mv64x60_pic.c
index 19e6ef26379751b6cafa9848dc6a4fdfc8ad9277..2aa4ed066db11bcec9bcfa7127b3b7c50eb9b8d9 100644 (file)
--- a/arch/powerpc/sysdev/mv64x60_pic.c
+++ b/arch/powerpc/sysdev/mv64x60_pic.c
@@ -238,13 +238,13 @@ void __init mv64x60_init_irq(void)
        const unsigned int *reg;
        unsigned long flags;
 
-       np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp");
+       np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
        reg = of_get_property(np, "reg", &size);
        paddr = of_translate_address(np, reg);
        mv64x60_gpp_reg_base = ioremap(paddr, reg[1]);
        of_node_put(np);
 
-       np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-pic");
+       np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-pic");
        reg = of_get_property(np, "reg", &size);
        paddr = of_translate_address(np, reg);
        mv64x60_irq_reg_base = ioremap(paddr, reg[1]);