Merge v2.6.37-rc8 into powerpc/next

[karo-tx-linux.git] / arch / powerpc / sysdev / mpc8xxx_gpio.c

diff --git a/arch/powerpc/sysdev/mpc8xxx_gpio.c b/arch/powerpc/sysdev/mpc8xxx_gpio.c
index 36499394a1618dd55f673aa4d4bf82bcd1296ae1..c48cd81780796da657294cfa484b6e323b91971b 100644 (file)
--- a/arch/powerpc/sysdev/mpc8xxx_gpio.c
+++ b/arch/powerpc/sysdev/mpc8xxx_gpio.c
@@ -389,6 +389,9 @@ static int __init mpc8xxx_add_gpiochips(void)
        for_each_matching_node(np, mpc8xxx_gpio_ids)
                mpc8xxx_add_controller(np);
 
+       for_each_compatible_node(np, NULL, "fsl,qoriq-gpio")
+               mpc8xxx_add_controller(np);
+
        return 0;
 }
 arch_initcall(mpc8xxx_add_gpiochips);