aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/dispnv04/crtc.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-05-20 09:22:55 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-05-20 14:43:04 +1000
commit4dc28134a8c124aa01b441e1e5b8b54312edc5dd (patch)
tree0b6e340765d2a67c1c92a30f2a1223ed111c66bc /drivers/gpu/drm/nouveau/dispnv04/crtc.c
parentMerge branch 'drm-uapi-extern-c-fixes' of https://github.com/evelikov/linux into drm-next (diff)
downloadlinux-dev-4dc28134a8c124aa01b441e1e5b8b54312edc5dd.tar.xz
linux-dev-4dc28134a8c124aa01b441e1e5b8b54312edc5dd.zip
drm/nouveau: rename nouveau_drm.h to nouveau_drv.h
Fixes out-of-tree build issue where uapi/drm/nouveau_drm.h gets picked up instead. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv04/crtc.c')
-rw-r--r--drivers/gpu/drm/nouveau/dispnv04/crtc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 55ccbf006b5e..6d4eb5d90fd3 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -28,8 +28,9 @@
#include <drm/drm_crtc_helper.h>
#include <drm/drm_plane_helper.h>
-#include "nouveau_drm.h"
+#include "nouveau_drv.h"
#include "nouveau_reg.h"
+#include "nouveau_ttm.h"
#include "nouveau_bo.h"
#include "nouveau_gem.h"
#include "nouveau_encoder.h"