git.openpandora.org
/
pandora-kernel.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
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nv50_display.c
diff --git
a/drivers/gpu/drm/nouveau/nv50_display.c
b/drivers/gpu/drm/nouveau/nv50_display.c
index
787ddc9
..
f97b42c
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv50_display.c
+++ b/
drivers/gpu/drm/nouveau/nv50_display.c
@@
-32,7
+32,7
@@
#include "nouveau_encoder.h"
#include "nouveau_connector.h"
#include "nouveau_fbcon.h"
-#include
"drm_crtc_helper.h"
+#include
<drm/drm_crtc_helper.h>
#include "nouveau_fence.h"
#include <core/gpuobj.h>