Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[~andy/linux] / 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 5b5d0148f8bf93273c2a1aaf5fd5e5a7ed23bfdc..6a17bf2ba9a414467c6767cd5ead8e5a097ec6a6 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