diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 22:29:08 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 22:29:08 +0200 |
| commit | 86727c62c8a88828084e42bb2b937c417e8edafe (patch) | |
| tree | c2afd0499dbd4524bdd08e517645c84184ad4464 /drivers/pinctrl | |
| parent | 0c6abd1f25caef85268eb04d09c988615d68d565 (diff) | |
| parent | c2c70a7905dbf97472e9a5fa6919675462373994 (diff) | |
Merge tag 's3c24xx-pinctrl-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim:
based on s3c24xx-pinctrl
- use correct header for chained_irq functions for s3c24xx-pinctrl
* tag 's3c24xx-pinctrl-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
pinctrl: s3c24xx: use correct header for chained_irq functions
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl-s3c24xx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-s3c24xx.c b/drivers/pinctrl/pinctrl-s3c24xx.c index c8b03996cdc..24446daaad7 100644 --- a/drivers/pinctrl/pinctrl-s3c24xx.c +++ b/drivers/pinctrl/pinctrl-s3c24xx.c @@ -19,12 +19,11 @@ #include <linux/irqdomain.h> #include <linux/irq.h> #include <linux/of_irq.h> +#include <linux/irqchip/chained_irq.h> #include <linux/io.h> #include <linux/slab.h> #include <linux/err.h> -#include <asm/mach/irq.h> - #include "pinctrl-samsung.h" #define NUM_EINT 24 |