diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-12-09 08:04:37 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-12-09 08:04:37 -0500 |
| commit | bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661 (patch) | |
| tree | da6e170ce87891a0242de88d8d7c1ba34faf9bb7 /drivers/gpio/gpio-mvebu.c | |
| parent | 33e0aae11e4854c792e9871f94da6d28bf2e2bb8 (diff) | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
Merge tag 'v3.13-rc3' into devel
Linux 3.13-rc3
Diffstat (limited to 'drivers/gpio/gpio-mvebu.c')
| -rw-r--r-- | drivers/gpio/gpio-mvebu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index a8908009803f..bc78a9da5502 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c | |||
| @@ -79,7 +79,7 @@ struct mvebu_gpio_chip { | |||
| 79 | spinlock_t lock; | 79 | spinlock_t lock; |
| 80 | void __iomem *membase; | 80 | void __iomem *membase; |
| 81 | void __iomem *percpu_membase; | 81 | void __iomem *percpu_membase; |
| 82 | unsigned int irqbase; | 82 | int irqbase; |
| 83 | struct irq_domain *domain; | 83 | struct irq_domain *domain; |
| 84 | int soc_variant; | 84 | int soc_variant; |
| 85 | }; | 85 | }; |