aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-20 16:29:08 -0400
committerArnd Bergmann <arnd@arndb.de>2013-06-20 16:29:08 -0400
commit86727c62c8a88828084e42bb2b937c417e8edafe (patch)
treec2afd0499dbd4524bdd08e517645c84184ad4464
parent0c6abd1f25caef85268eb04d09c988615d68d565 (diff)
parentc2c70a7905dbf97472e9a5fa6919675462373994 (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>
-rw-r--r--drivers/pinctrl/pinctrl-s3c24xx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-s3c24xx.c b/drivers/pinctrl/pinctrl-s3c24xx.c
index c8b03996cdcb..24446daaad7d 100644
--- a/drivers/pinctrl/pinctrl-s3c24xx.c
+++ b/drivers/pinctrl/pinctrl-s3c24xx.c
@@ -19,12 +19,11 @@
19#include <linux/irqdomain.h> 19#include <linux/irqdomain.h>
20#include <linux/irq.h> 20#include <linux/irq.h>
21#include <linux/of_irq.h> 21#include <linux/of_irq.h>
22#include <linux/irqchip/chained_irq.h>
22#include <linux/io.h> 23#include <linux/io.h>
23#include <linux/slab.h> 24#include <linux/slab.h>
24#include <linux/err.h> 25#include <linux/err.h>
25 26
26#include <asm/mach/irq.h>
27
28#include "pinctrl-samsung.h" 27#include "pinctrl-samsung.h"
29 28
30#define NUM_EINT 24 29#define NUM_EINT 24