diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-05 18:57:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-05 18:57:18 -0700 |
| commit | e9011d086674caeedb0ffb6eb5b8bc5920821df3 (patch) | |
| tree | ed5d06353d8dc1fa5f6da349808f8345ca2291a5 /drivers/gpio/gpio-rcar.c | |
| parent | cfcfe22256d5a8a14924a1145d56017b043b554f (diff) | |
| parent | c78f77e20d2ba5d4d5e478e85a6fb42556893e2d (diff) | |
| download | linux-e9011d086674caeedb0ffb6eb5b8bc5920821df3.tar.gz linux-e9011d086674caeedb0ffb6eb5b8bc5920821df3.tar.bz2 linux-e9011d086674caeedb0ffb6eb5b8bc5920821df3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Conflicts:
arch/sparc/mm/init_64.c
Conflict was simple non-overlapping additions.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpio/gpio-rcar.c')
| -rw-r--r-- | drivers/gpio/gpio-rcar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index 0c9f803fc1ac..b6ae89ea8811 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -284,6 +284,7 @@ static int gpio_rcar_irq_domain_map(struct irq_domain *h, unsigned int irq, static struct irq_domain_ops gpio_rcar_irq_domain_ops = { .map = gpio_rcar_irq_domain_map, + .xlate = irq_domain_xlate_twocell, }; struct gpio_rcar_info { |