diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:59:19 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:59:19 +0200 |
commit | 797b3a9ee790e8de2a34d427de96a1bb560fe0db (patch) | |
tree | dcc58ac1a966294b010521def7296d428f858583 /drivers/staging | |
parent | c985d7e325fd5c2bf78de2f705f6001bce143a26 (diff) | |
parent | bc895b5987dd5fad89c0e9693b38104679b647c4 (diff) | |
download | op-kernel-dev-797b3a9ee790e8de2a34d427de96a1bb560fe0db.zip op-kernel-dev-797b3a9ee790e8de2a34d427de96a1bb560fe0db.tar.gz |
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/staging')
-rw-r--r-- | drivers/staging/imx-drm/ipu-v3/ipu-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c index 366f259..6efe4e1 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c @@ -25,8 +25,8 @@ #include <linux/clk.h> #include <linux/list.h> #include <linux/irq.h> +#include <linux/irqchip/chained_irq.h> #include <linux/of_device.h> -#include <asm/mach/irq.h> #include "imx-ipu-v3.h" #include "ipu-prv.h" |