diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-11 00:08:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-11 00:08:32 -0700 |
| commit | 143b9d01211b883cc56343ca5df25b156bf193ff (patch) | |
| tree | 296583c4600399d9944217f42154e21eb199b866 /include | |
| parent | 4d8f509e7a5d2eb636d57ddb677e504a90a4f99d (diff) | |
| parent | 0d7c1210992ff05ee8de5d2c790defded3856f29 (diff) | |
| download | linux-143b9d01211b883cc56343ca5df25b156bf193ff.tar.gz linux-143b9d01211b883cc56343ca5df25b156bf193ff.tar.bz2 linux-143b9d01211b883cc56343ca5df25b156bf193ff.zip | |
Merge tag 'renesas-intc-external-irq-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical
From Simon Horman:
Update for Renesas INTC External IRQ pin driver for v3.11
- Correct error handing in irqc_probe
- Add irqchip_init dummy function
* tag 'renesas-intc-external-irq-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
irqchip: Add irqchip_init dummy function
irqchip: renesas-irqc: Fix irqc_probe error handling
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqchip.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h index e0006f1d35a0..14d79131f53d 100644 --- a/include/linux/irqchip.h +++ b/include/linux/irqchip.h @@ -11,6 +11,10 @@ #ifndef _LINUX_IRQCHIP_H #define _LINUX_IRQCHIP_H +#ifdef CONFIG_IRQCHIP void irqchip_init(void); +#else +static inline void irqchip_init(void) {} +#endif #endif |