projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'imx-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next...
[linux-2.6-block.git]
/
drivers
/
staging
/
imx-drm
/
ipu-v3
/
ipu-common.c
diff --git
a/drivers/staging/imx-drm/ipu-v3/ipu-common.c
b/drivers/staging/imx-drm/ipu-v3/ipu-common.c
index 04b8320d6579ceaf60caef73cf36edb2e96b3cfb..148f98e9aaf7aa31fbefd7d73a78e444b3793bd3 100644
(file)
--- a/
drivers/staging/imx-drm/ipu-v3/ipu-common.c
+++ b/
drivers/staging/imx-drm/ipu-v3/ipu-common.c
@@
-26,8
+26,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"