diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:20:30 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:21:47 -0500 |
| commit | d392da5207352f09030e95d9ea335a4225667ec0 (patch) | |
| tree | 7d6cd1932afcad0a5619a5c504a6d93ca318187c /arch/powerpc/sysdev/mpc8xxx_gpio.c | |
| parent | e39d5ef678045d61812c1401f04fe8edb14d6359 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'arch/powerpc/sysdev/mpc8xxx_gpio.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpc8xxx_gpio.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/mpc8xxx_gpio.c b/arch/powerpc/sysdev/mpc8xxx_gpio.c index 36499394a161..c48cd8178079 100644 --- 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) | |||
| 389 | for_each_matching_node(np, mpc8xxx_gpio_ids) | 389 | for_each_matching_node(np, mpc8xxx_gpio_ids) |
| 390 | mpc8xxx_add_controller(np); | 390 | mpc8xxx_add_controller(np); |
| 391 | 391 | ||
| 392 | for_each_compatible_node(np, NULL, "fsl,qoriq-gpio") | ||
| 393 | mpc8xxx_add_controller(np); | ||
| 394 | |||
| 392 | return 0; | 395 | return 0; |
| 393 | } | 396 | } |
| 394 | arch_initcall(mpc8xxx_add_gpiochips); | 397 | arch_initcall(mpc8xxx_add_gpiochips); |