From: Grant Likely <grant.likely@secretlab.ca>
Date: Thu, 30 Dec 2010 05:20:30 +0000 (-0700)
Subject: Merge v2.6.37-rc8 into powerpc/next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d392da5207352f09030e95d9ea335a4225667ec0;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge v2.6.37-rc8 into powerpc/next
---

d392da5207352f09030e95d9ea335a4225667ec0
diff --cc arch/powerpc/sysdev/mpc8xxx_gpio.c
index 36499394a161,c0ea05e87f1d..c48cd8178079
--- a/arch/powerpc/sysdev/mpc8xxx_gpio.c
+++ b/arch/powerpc/sysdev/mpc8xxx_gpio.c
@@@ -386,9 -321,18 +386,12 @@@ static int __init mpc8xxx_add_gpiochips
  {
  	struct device_node *np;
  
 -	for_each_compatible_node(np, NULL, "fsl,mpc8349-gpio")
 -		mpc8xxx_add_controller(np);
 -
 -	for_each_compatible_node(np, NULL, "fsl,mpc8572-gpio")
 -		mpc8xxx_add_controller(np);
 -
 -	for_each_compatible_node(np, NULL, "fsl,mpc8610-gpio")
 +	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);