From bb5095e41e5bdceaae68eb9c8181d64baeb5142a Mon Sep 17 00:00:00 2001
From: Terence Hampson <thampson@codeaurora.org>
Date: Fri, 8 Aug 2014 14:53:34 -0400
Subject: mdss: Display related changes commit below

While merging to 3.14 kernel this is only display
related changes for commit below
Change ID: Ie0d5b104882d1534fae262af85e99cc09a56ab04

	msm: msm_bus: Move bus scaling to platform drivers

Change-Id: Id726a65b5641b57c0edd3ba33f2e5b3f68aff643
Signed-off-by: Terence Hampson <thampson@codeaurora.org>
---
 Documentation/devicetree/bindings/fb/mdss-mdp.txt | 2 +-
 drivers/video/fbdev/msm/mdp3.c                    | 4 ++--
 drivers/video/fbdev/msm/mdss_mdp.c                | 4 ++--
 drivers/video/fbdev/msm/mdss_mdp_overlay.c        | 2 +-
 drivers/video/fbdev/msm/mdss_mdp_pp.c             | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/devicetree/bindings/fb/mdss-mdp.txt b/Documentation/devicetree/bindings/fb/mdss-mdp.txt
index 73871c3e9d48..ae73e17a5f82 100644
--- a/Documentation/devicetree/bindings/fb/mdss-mdp.txt
+++ b/Documentation/devicetree/bindings/fb/mdss-mdp.txt
@@ -158,7 +158,7 @@ Bus Scaling Data:
 				of (src, dst, ab, ib) which is defined at
 				Documentation/devicetree/bindings/arm/msm/msm_bus.txt
 				* Current values of src & dst are defined at
-				arch/arm/mach-msm/msm_bus_board.h
+				include/linux/msm-bus-board.h
 				src values allowed for MDSS are:
 					22 = MSM_BUS_MASTER_MDP_PORT0
 					23 = MSM_BUS_MASTER_MDP_PORT1
diff --git a/drivers/video/fbdev/msm/mdp3.c b/drivers/video/fbdev/msm/mdp3.c
index c9834d6a2fef..9cdd17bad14a 100644
--- a/drivers/video/fbdev/msm/mdp3.c
+++ b/drivers/video/fbdev/msm/mdp3.c
@@ -42,8 +42,8 @@
 
 #include <mach/board.h>
 #include <mach/hardware.h>
-#include <mach/msm_bus.h>
-#include <mach/msm_bus_board.h>
+#include <linux/msm_bus.h>
+#include <linux/msm_bus_board.h>
 #include <linux/qcom_iommu.h>
 #include <linux/msm_iommu_domains.h>
 #include <mach/msm_memtypes.h>
diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c
index 23721ce17cec..07d92a3f2f3d 100644
--- a/drivers/video/fbdev/msm/mdss_mdp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp.c
@@ -43,8 +43,8 @@
 
 #include <mach/board.h>
 #include <mach/hardware.h>
-#include <mach/msm_bus.h>
-#include <mach/msm_bus_board.h>
+#include <linux/msm_bus.h>
+#include <linux/msm_bus_board.h>
 #include <linux/qcom_iommu.h>
 #include <linux/msm_iommu_domains.h>
 #include <mach/memory.h>
diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
index 451804c09a14..e98be3ff4892 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
@@ -29,7 +29,7 @@
 
 #include <linux/msm_iommu_domains.h>
 #include <soc/qcom/event_timer.h>
-#include <mach/msm_bus.h>
+#include <linux/msm_bus.h>
 #include "mdss.h"
 #include "mdss_debug.h"
 #include "mdss_fb.h"
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c
index 4cdab9b06c48..c0443c35756f 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c
@@ -20,8 +20,8 @@
 #include <linux/uaccess.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
-#include <mach/msm_bus.h>
-#include <mach/msm_bus_board.h>
+#include <linux/msm_bus.h>
+#include <linux/msm_bus_board.h>
 
 struct mdp_csc_cfg mdp_csc_convert[MDSS_MDP_MAX_CSC] = {
 	[MDSS_MDP_CSC_RGB2RGB] = {
-- 
cgit v1.2.3