Merge v2.6.37-rc8 into powerpc/next

This commit is contained in:
Grant Likely
2010-12-29 22:20:30 -07:00
12562 changed files with 1142624 additions and 791881 deletions

View File

@@ -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);