[2/3] Fix compile error in drivers/gpu/drm/msm/msm_drv.c

Commit Message

Joerg Roedel Sept. 25, 2013, 2:49 p.m. UTC

The include file has been moved but this file was not
updated, so compile breaks.

Signed-off-by: Joerg Roedel <[e-mail]>
---
 drivers/gpu/drm/msm/Makefile  |    3 ---
 drivers/gpu/drm/msm/msm_drv.c |    5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
index e179148..fc7ed9e 100644
--- a/drivers/gpu/drm/msm/Makefile
+++ b/drivers/gpu/drm/msm/Makefile
@@ -1,7 +1,4 @@ 
 ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm
-ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
-	ccflags-y += -Werror
-endif
 
 msm-y := \
 	adreno/adreno_gpu.o \
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 008d772..08acebb 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -18,7 +18,10 @@ 
 #include "msm_drv.h"
 #include "msm_gpu.h"
 
-#include <mach/iommu.h>
+#ifndef I_AM_NOT_TOO_LAZY_TO_FIX_DRIVERS_WHEN_I_MOVE_INCLUDE_FILES
+#warning "Help! I use non-public subsystem headers. Please fix me!"
+#include <../../../iommu/msm_iommu.h>
+#endif
 
 static void msm_fb_output_poll_changed(struct drm_device *dev)
 {