Merge tag 'tags/disintegrate-tile-20121009' into for-linus

[~andy/linux] / 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 787ddc9f314cd967690455c042911e90e313aa81..f97b42cbb6bb4394de0a088c767351623346b5b1 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>