[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1380120582-9068-2-git-send-email-joro@8bytes.org>
Date: Wed, 25 Sep 2013 16:49:41 +0200
From: Joerg Roedel <joro@...tes.org>
To: Stephen Boyd <sboyd@...eaurora.org>
Cc: David Airlie <airlied@...ux.ie>, Rob Clark <robdclark@...il.com>,
dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org,
iommu@...ts.linux-foundation.org, Joerg Roedel <joro@...tes.org>
Subject: [PATCH 2/3] Fix compile error in drivers/gpu/drm/msm/msm_drv.c
The include file has been moved but this file was not
updated, so compile breaks.
Signed-off-by: Joerg Roedel <joro@...tes.org>
---
drivers/gpu/drm/msm/Makefile | 3 ---
drivers/gpu/drm/msm/msm_drv.c | 5 ++++-
2 files changed, 4 insertions(+), 4 deletions(-)
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)
{
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists