Commit 1e819b3e authored by Olof Johansson's avatar Olof Johansson

Merge tag 'omap-for-v3.13/pinctrl-fix' of...

Merge tag 'omap-for-v3.13/pinctrl-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:

Looks like I managed to break the x86 build for some
configs. Here's a fix for that on top of the pinctrl
changes already merged with the signed tag
omap-for-v3.13/quirk-signed.

* tag 'omap-for-v3.13/pinctrl-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  pinctrl: single: Fix build when not built on ARM
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ee4383e0 1b9c0fb3
...@@ -1747,7 +1747,12 @@ static int pcs_irqdomain_map(struct irq_domain *d, unsigned int irq, ...@@ -1747,7 +1747,12 @@ static int pcs_irqdomain_map(struct irq_domain *d, unsigned int irq,
irq_set_chip_data(irq, pcs_soc); irq_set_chip_data(irq, pcs_soc);
irq_set_chip_and_handler(irq, &pcs->chip, irq_set_chip_and_handler(irq, &pcs->chip,
handle_level_irq); handle_level_irq);
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
#ifdef CONFIG_ARM
set_irq_flags(irq, IRQF_VALID);
#else
irq_set_noprobe(irq);
#endif
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment