diff options
| author | Arnd Bergmann | 2018-01-05 22:11:47 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2018-01-05 22:12:37 +0100 |
| commit | 71ebb396b7b0bd2f45034786fd4eb496cb1fccdd (patch) | |
| tree | 4c4d844c4d460051dfddd13764e624a7017aaa5d /drivers | |
| parent | 5796e682e6495923b0fea0cf1f2b095520bc29ec (diff) | |
| parent | 8bb65fc06c08f027980a917648e1cf6e4d51c5ad (diff) | |
Merge commit '8bb65fc06c' into next/soc
This includes one fix from mainline to avoid introducing a build
regression after the pxa tree starts using gpio-reg:
drivers/gpio/gpio-reg.c:106:21: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'?
drivers/gpio/gpio-reg.c:107:29: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'?
* commit '8bb65fc06c':
gpio: gpio-reg: fix build
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpio-reg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-reg.c b/drivers/gpio/gpio-reg.c index 23e771dba4c1..e85903eddc68 100644 --- a/drivers/gpio/gpio-reg.c +++ b/drivers/gpio/gpio-reg.c @@ -103,8 +103,8 @@ static int gpio_reg_to_irq(struct gpio_chip *gc, unsigned offset) struct gpio_reg *r = to_gpio_reg(gc); int irq = r->irqs[offset]; - if (irq >= 0 && r->irq.domain) - irq = irq_find_mapping(r->irq.domain, irq); + if (irq >= 0 && r->irqdomain) + irq = irq_find_mapping(r->irqdomain, irq); return irq; } |