diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 20:59:19 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 20:59:19 +0400 |
| commit | 797b3a9ee790e8de2a34d427de96a1bb560fe0db (patch) | |
| tree | dcc58ac1a966294b010521def7296d428f858583 /drivers/pinctrl/pinctrl-sirf.c | |
| parent | c985d7e325fd5c2bf78de2f705f6001bce143a26 (diff) | |
| parent | bc895b5987dd5fad89c0e9693b38104679b647c4 (diff) | |
| download | linux-797b3a9ee790e8de2a34d427de96a1bb560fe0db.tar.xz | |
Merge branch 'gic/cleanup' into next/soc2
Both zynq and shmobile have conflicts against the gic cleanup
series, resolved here.
Conflicts:
arch/arm/mach-shmobile/smp-emev2.c
arch/arm/mach-shmobile/smp-r8a7779.c
arch/arm/mach-shmobile/smp-sh73a0.c
arch/arm/mach-zynq/platsmp.c
drivers/gpio/gpio-pl061.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/pinctrl/pinctrl-sirf.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-sirf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-sirf.c b/drivers/pinctrl/pinctrl-sirf.c index 0990a721758e..08582fecdf1b 100644 --- a/drivers/pinctrl/pinctrl-sirf.c +++ b/drivers/pinctrl/pinctrl-sirf.c @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/err.h> #include <linux/irqdomain.h> +#include <linux/irqchip/chained_irq.h> #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinmux.h> #include <linux/pinctrl/consumer.h> @@ -25,7 +26,6 @@ #include <linux/bitops.h> #include <linux/gpio.h> #include <linux/of_gpio.h> -#include <asm/mach/irq.h> #define DRIVER_NAME "pinmux-sirf" |