diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-19 02:30:19 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-19 02:30:19 +0200 |
| commit | 1e819b3ed3faa81f7996b8fb5690ab35b4a0fa2e (patch) | |
| tree | 2b927c40ffd7c0525595a4be51121d706ee94202 /drivers | |
| parent | Merge tag 'omap-for-v3.13/board-removal-signed-take2' of git://git.kernel.org... (diff) | |
| parent | pinctrl: single: Fix build when not built on ARM (diff) | |
| download | linux-1e819b3ed3faa81f7996b8fb5690ab35b4a0fa2e.tar.xz linux-1e819b3ed3faa81f7996b8fb5690ab35b4a0fa2e.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pinctrl/pinctrl-single.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index c2aada71c915..0846922b2316 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -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_and_handler(irq, &pcs->chip, 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; } |