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 branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[linux-2.6-block.git]
/
drivers
/
staging
/
imx-drm
/
ipuv3-crtc.c
diff --git
a/drivers/staging/imx-drm/ipuv3-crtc.c
b/drivers/staging/imx-drm/ipuv3-crtc.c
index 47bec5e17358658adee84f4b0a53eafd43c1a405..720868bff35bb9368d6ddad7cee8ca735a101c5b 100644
(file)
--- a/
drivers/staging/imx-drm/ipuv3-crtc.c
+++ b/
drivers/staging/imx-drm/ipuv3-crtc.c
@@
-30,7
+30,7
@@
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_fb_cma_helper.h>
-#include
"ipu-v3/imx-ipu-v3.h"
+#include
<video/imx-ipu-v3.h>
#include "imx-drm.h"
#include "ipuv3-plane.h"