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-plane.c
diff --git
a/drivers/staging/imx-drm/ipuv3-plane.c
b/drivers/staging/imx-drm/ipuv3-plane.c
index 5697e59ddf1dc01b1da0aaf9f0f161b4bf71cfdc..6f393a11f44d2d57fa074defc77ce048796b36cc 100644
(file)
--- a/
drivers/staging/imx-drm/ipuv3-plane.c
+++ b/
drivers/staging/imx-drm/ipuv3-plane.c
@@
-17,7
+17,7
@@
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_gem_cma_helper.h>
-#include "
ipu-v3
/imx-ipu-v3.h"
+#include "
video
/imx-ipu-v3.h"
#include "ipuv3-plane.h"
#define to_ipu_plane(x) container_of(x, struct ipu_plane, base)