Merge branches 'sh/stable-updates' and 'sh/sparseirq'

[mv-sheeva.git] / arch / xtensa / variants / s6000 / gpio.c

diff --git a/arch/xtensa/variants/s6000/gpio.c b/arch/xtensa/variants/s6000/gpio.c
index 33a8d952934ca9f08d353887b05c52e63aed6b6a..79317fdcf14c36d36563157d079f346002f18573 100644 (file)
--- a/arch/xtensa/variants/s6000/gpio.c
+++ b/arch/xtensa/variants/s6000/gpio.c
@@ -64,8 +64,7 @@ static struct gpio_chip gpiochip = {
        .exported = 0, /* no exporting to userspace */
 };
 
-static int gpio_init(void)
+int s6_gpio_init(void)
 {
        return gpiochip_add(&gpiochip);
 }
-device_initcall(gpio_init);