diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2013-05-08 10:22:07 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-05-08 10:22:07 +0100 |
| commit | e6b6dc7f35f9bf91b1e4ef14e5112948910b8875 (patch) | |
| tree | df60971e6b7049bc3ca2d1229b89c300fe8cf107 /drivers/pinctrl/pinctrl-sirf.c | |
| parent | 16c85a1fd73eade2ae290d759924c09b4595f504 (diff) | |
| parent | c0114709ed85a5693eb74acdfa03d94f7f12e5b8 (diff) | |
Merge branch 'gic' into HEAD
* arm64-prep-gic:
irqchip: gic: Perform the gic_secondary_init() call via CPU notifier
irqchip: gic: Call handle_bad_irq() directly
arm: Move chained_irq_(enter|exit) to a generic file
arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.h
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 d02498b30c6e..ab26b4b669d5 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" |