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/gpio/gpio-mxc.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/gpio/gpio-mxc.c')
-rw-r--r-- | drivers/gpio/gpio-mxc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index 7877335c4cc8..7176743915d3 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c @@ -24,6 +24,7 @@ #include <linux/io.h> #include <linux/irq.h> #include <linux/irqdomain.h> +#include <linux/irqchip/chained_irq.h> #include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/slab.h> @@ -32,7 +33,6 @@ #include <linux/of_device.h> #include <linux/module.h> #include <asm-generic/bug.h> -#include <asm/mach/irq.h> enum mxc_gpio_hwtype { IMX1_GPIO, /* runs on i.mx1 */ |