Getting GPIO to build again

[Jon Smirl]

I just synced up to linus/master....

  CC      arch/powerpc/platforms/52xx/mpc52xx_gpio.o
In file included from arch/powerpc/platforms/52xx/mpc52xx_gpio.c:22:
include/linux/of_gpio.h:26: error: field 'gc' has incomplete type
include/linux/of_gpio.h: In function 'to_of_gpio_chip':
include/linux/of_gpio.h:34: warning: type defaults to 'int' in
declaration of '__mptr'
include/linux/of_gpio.h:34: warning: initialization from incompatible
pointer type
In file included from include/asm/gpio.h:18,
                 from arch/powerpc/platforms/52xx/mpc52xx_gpio.c:26:
include/asm-generic/gpio.h: At top level:
include/asm-generic/gpio.h:24: error: redefinition of 'gpio_is_valid'
include/linux/gpio.h:24: error: previous definition of 'gpio_is_valid' was here
In file included from arch/powerpc/platforms/52xx/mpc52xx_gpio.c:26:
include/asm/gpio.h:27: error: redefinition of 'gpio_get_value'
include/linux/gpio.h:50: error: previous definition of 'gpio_get_value' was here
include/asm/gpio.h:32: error: redefinition of 'gpio_set_value'
include/linux/gpio.h:57: error: previous definition of 'gpio_set_value' was here
include/asm/gpio.h:37: error: redefinition of 'gpio_cansleep'
include/linux/gpio.h:63: error: previous definition of 'gpio_cansleep' was here
include/asm/gpio.h:45: error: redefinition of 'gpio_to_irq'
include/linux/gpio.h:83: error: previous definition of 'gpio_to_irq' was here
include/asm/gpio.h:50: error: redefinition of 'irq_to_gpio'
include/linux/gpio.h:90: error: previous definition of 'irq_to_gpio' was here
make[2]: *** [arch/powerpc/platforms/52xx/mpc52xx_gpio.o] Error 1
make[1]: *** [arch/powerpc/platforms/52xx] Error 2
make: *** [arch/powerpc/platforms] Error 2


-- 
Jon Smirl
jonsmirl at gmail.com