diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-28 09:06:57 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-28 09:06:57 +0300 |
| commit | 6afc0c269c3d20cde05515b00ede00e91fee0be5 (patch) | |
| tree | d54e7fa59df16bb62902129dfd28956d9ae1be19 /drivers/gpio/gpio-zx.c | |
| parent | 968d712a2565121b269e1037a1517916a9769423 (diff) | |
| parent | 097f70b3c4d84ffccca15195bdfde3a37c0a7c0f (diff) | |
| download | linux-6afc0c269c3d20cde05515b00ede00e91fee0be5.tar.xz | |
Merge branch 'linus' into perf/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpio/gpio-zx.c')
| -rw-r--r-- | drivers/gpio/gpio-zx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-zx.c b/drivers/gpio/gpio-zx.c index 12ee1969298c..4b8a26910705 100644 --- a/drivers/gpio/gpio-zx.c +++ b/drivers/gpio/gpio-zx.c @@ -177,7 +177,7 @@ static int zx_irq_type(struct irq_data *d, unsigned trigger) return 0; } -static void zx_irq_handler(unsigned irq, struct irq_desc *desc) +static void zx_irq_handler(struct irq_desc *desc) { unsigned long pending; int offset; |