Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / 86xx / gef_gpio.c

diff --git a/arch/powerpc/platforms/86xx/gef_gpio.c b/arch/powerpc/platforms/86xx/gef_gpio.c
index b8cb08dbd89c62b435b13a2fa69a2819a974d130..4ff7b1e7bbada2917bfd89e2950ac0c178f6a554 100644 (file)
--- a/arch/powerpc/platforms/86xx/gef_gpio.c
+++ b/arch/powerpc/platforms/86xx/gef_gpio.c
@@ -118,12 +118,12 @@ static int __init gef_gpio_init(void)
                }
 
                /* Setup pointers to chip functions */
-               gef_gpio_chip->of_gc.gpio_cells = 2;
-               gef_gpio_chip->of_gc.gc.ngpio = 19;
-               gef_gpio_chip->of_gc.gc.direction_input = gef_gpio_dir_in;
-               gef_gpio_chip->of_gc.gc.direction_output = gef_gpio_dir_out;
-               gef_gpio_chip->of_gc.gc.get = gef_gpio_get;
-               gef_gpio_chip->of_gc.gc.set = gef_gpio_set;
+               gef_gpio_chip->gc.of_gpio_n_cells = 2;
+               gef_gpio_chip->gc.ngpio = 19;
+               gef_gpio_chip->gc.direction_input = gef_gpio_dir_in;
+               gef_gpio_chip->gc.direction_output = gef_gpio_dir_out;
+               gef_gpio_chip->gc.get = gef_gpio_get;
+               gef_gpio_chip->gc.set = gef_gpio_set;
 
                /* This function adds a memory mapped GPIO chip */
                retval = of_mm_gpiochip_add(np, gef_gpio_chip);
@@ -146,12 +146,12 @@ static int __init gef_gpio_init(void)
                }
 
                /* Setup pointers to chip functions */
-               gef_gpio_chip->of_gc.gpio_cells = 2;
-               gef_gpio_chip->of_gc.gc.ngpio = 6;
-               gef_gpio_chip->of_gc.gc.direction_input = gef_gpio_dir_in;
-               gef_gpio_chip->of_gc.gc.direction_output = gef_gpio_dir_out;
-               gef_gpio_chip->of_gc.gc.get = gef_gpio_get;
-               gef_gpio_chip->of_gc.gc.set = gef_gpio_set;
+               gef_gpio_chip->gc.of_gpio_n_cells = 2;
+               gef_gpio_chip->gc.ngpio = 6;
+               gef_gpio_chip->gc.direction_input = gef_gpio_dir_in;
+               gef_gpio_chip->gc.direction_output = gef_gpio_dir_out;
+               gef_gpio_chip->gc.get = gef_gpio_get;
+               gef_gpio_chip->gc.set = gef_gpio_set;
 
                /* This function adds a memory mapped GPIO chip */
                retval = of_mm_gpiochip_add(np, gef_gpio_chip);