diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 12:59:19 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 12:59:19 -0400 |
| commit | 797b3a9ee790e8de2a34d427de96a1bb560fe0db (patch) | |
| tree | dcc58ac1a966294b010521def7296d428f858583 /drivers/staging | |
| parent | c985d7e325fd5c2bf78de2f705f6001bce143a26 (diff) | |
| parent | bc895b5987dd5fad89c0e9693b38104679b647c4 (diff) | |
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 366f259e3756..6efe4e1b499f 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 @@ | |||
| 25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
| 26 | #include <linux/list.h> | 26 | #include <linux/list.h> |
| 27 | #include <linux/irq.h> | 27 | #include <linux/irq.h> |
| 28 | #include <linux/irqchip/chained_irq.h> | ||
| 28 | #include <linux/of_device.h> | 29 | #include <linux/of_device.h> |
| 29 | #include <asm/mach/irq.h> | ||
| 30 | 30 | ||
| 31 | #include "imx-ipu-v3.h" | 31 | #include "imx-ipu-v3.h" |
| 32 | #include "ipu-prv.h" | 32 | #include "ipu-prv.h" |