diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-07-17 08:45:31 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-07-17 08:45:31 -0400 |
| commit | bcae888039d5f0b522e1588c54f95a7612d1723c (patch) | |
| tree | d8039698a3b74223dc94798046049e9bfcf23fe7 /drivers/gpio/gpio-sa1100.c | |
| parent | 3685bbce2ea6142e81c78e6f3d5b2a1cdc37660e (diff) | |
| parent | bdac2b6dc7392668a8530d67a5f762366f57f9b4 (diff) | |
Merge branch 'queue/irq/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into devel
Diffstat (limited to 'drivers/gpio/gpio-sa1100.c')
| -rw-r--r-- | drivers/gpio/gpio-sa1100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c index 3fa22dade243..e847a4cf9326 100644 --- a/drivers/gpio/gpio-sa1100.c +++ b/drivers/gpio/gpio-sa1100.c | |||
| @@ -173,9 +173,9 @@ static struct irq_domain *sa1100_gpio_irqdomain; | |||
| 173 | * and call the handler. | 173 | * and call the handler. |
| 174 | */ | 174 | */ |
| 175 | static void | 175 | static void |
| 176 | sa1100_gpio_handler(unsigned int irq, struct irq_desc *desc) | 176 | sa1100_gpio_handler(unsigned int __irq, struct irq_desc *desc) |
| 177 | { | 177 | { |
| 178 | unsigned int mask; | 178 | unsigned int irq, mask; |
| 179 | 179 | ||
| 180 | mask = GEDR; | 180 | mask = GEDR; |
| 181 | do { | 181 | do { |