Merge tag 's3c24xx-pinctrl-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

Arnd Bergmann 12 years ago 86727c62 0c6abd1f

+1 -2

1 changed file

expand all

drivers

pinctrl

pinctrl-s3c24xx.c

+1 -2

drivers/pinctrl/pinctrl-s3c24xx.c

··· 19 19 #include <linux/irqdomain.h> 20 20 #include <linux/irq.h> 21 21 #include <linux/of_irq.h> 22 + #include <linux/irqchip/chained_irq.h> 22 23 #include <linux/io.h> 23 24 #include <linux/slab.h> 24 25 #include <linux/err.h> 25 - 26 - #include <asm/mach/irq.h> 27 26 28 27 #include "pinctrl-samsung.h" 29 28