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
/
nouveau_encoder.h
diff --git
a/drivers/gpu/drm/nouveau/nouveau_encoder.h
b/drivers/gpu/drm/nouveau/nouveau_encoder.h
index
5b5d014
..
6a17bf2
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_encoder.h
+++ b/
drivers/gpu/drm/nouveau/nouveau_encoder.h
@@
-29,7
+29,7
@@
#include <subdev/bios/dcb.h>
-#include
"drm_encoder_slave.h"
+#include
<drm/drm_encoder_slave.h>
#include "nv04_display.h"
#define NV_DPMS_CLEARED 0x80