diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-01 15:06:21 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-01 15:06:21 -0400 |
commit | 3d58f48ba05caed9118bce62b3047f8683438835 (patch) | |
tree | 94c911034f0e14ded73d3e9e6e9f8e22b6cad822 /arch/xtensa/variants/s6000/gpio.c | |
parent | abfe0af9813153bae8c85d9bac966bafcb8ddab1 (diff) | |
parent | d9244b5d2fbfe9fa540024b410047af13ceec90f (diff) |
Merge branch 'linus' into irq/numa
Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
Merge reason: we gathered a few conflicts plus update to latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/xtensa/variants/s6000/gpio.c')
-rw-r--r-- | arch/xtensa/variants/s6000/gpio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/xtensa/variants/s6000/gpio.c b/arch/xtensa/variants/s6000/gpio.c index 33a8d952934c..79317fdcf14c 100644 --- a/arch/xtensa/variants/s6000/gpio.c +++ b/arch/xtensa/variants/s6000/gpio.c | |||
@@ -64,8 +64,7 @@ static struct gpio_chip gpiochip = { | |||
64 | .exported = 0, /* no exporting to userspace */ | 64 | .exported = 0, /* no exporting to userspace */ |
65 | }; | 65 | }; |
66 | 66 | ||
67 | static int gpio_init(void) | 67 | int s6_gpio_init(void) |
68 | { | 68 | { |
69 | return gpiochip_add(&gpiochip); | 69 | return gpiochip_add(&gpiochip); |
70 | } | 70 | } |
71 | device_initcall(gpio_init); | ||