Fix: Make it buildable on v4.3

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

diff --git a/drivers/soc/qcom/msm_bus/Makefile b/drivers/soc/qcom/msm_bus/Makefile
index 3bbf6bef1257089749e2c8a76dd47a3065cca2a4..2fbdc70114641be42033afcb5b3a94ff1e392daf 100644 (file)
--- a/drivers/soc/qcom/msm_bus/Makefile
+++ b/drivers/soc/qcom/msm_bus/Makefile
@@ -10,7 +10,8 @@ ifdef CONFIG_BUS_TOPOLOGY_ADHOC
        obj-y += msm_bus_fabric_adhoc.o msm_bus_arb_adhoc.o msm_bus_rules.o
        obj-$(CONFIG_OF) += msm_bus_of_adhoc.o
        obj-$(CONFIG_DEBUG_BUS_VOTER) += msm_bus_dbg_voter.o
-       obj-$(CONFIG_CORESIGHT) +=  msm_buspm_coresight_adhoc.o
+       # FIXME remove it temporarily till this driver is ported and tested 
+       #obj-$(CONFIG_CORESIGHT) +=  msm_buspm_coresight_adhoc.o
 else
        obj-y += msm_bus_fabric.o msm_bus_config.o msm_bus_arb.o
        obj-$(CONFIG_CORESIGHT) +=  msm_buspm_coresight.o

diff --git a/drivers/soc/qcom/msm_bus/msm_bus_core.h b/drivers/soc/qcom/msm_bus/msm_bus_core.h
index c63602efeb1f527592625afa8c1e50630e087342..c35a45caf2364eacdfdd3de523b098f75bf9da91 100644 (file)
--- a/drivers/soc/qcom/msm_bus/msm_bus_core.h
+++ b/drivers/soc/qcom/msm_bus/msm_bus_core.h
@@ -352,7 +352,8 @@ msm_bus_dbg_add_client(const struct msm_bus_client_handle *pdata)
 }
 #endif
 
-#ifdef CONFIG_CORESIGHT
+#if 0
+//#ifdef CONFIG_CORESIGHT
 int msmbus_coresight_init(struct platform_device *pdev);
 void msmbus_coresight_remove(struct platform_device *pdev);
 int msmbus_coresight_init_adhoc(struct platform_device *pdev,

diff --git a/drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c b/drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c
index aac7c5325c74e1ceb0e52a99eabd001ff59bb288..eb369aa8df764729671da8d51fcb780dce3e294c 100644 (file)
--- a/drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c
@@ -17,7 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/mfd/qcom-smd-rpm.h>
+#include <linux/soc/qcom/smd-rpm.h>
 #include "msm_bus_core.h"
 #include "msm_bus_adhoc.h"
 #include "msm_bus_noc.h"

diff --git a/drivers/soc/qcom/msm_bus/msm_bus_rpm_smd.c b/drivers/soc/qcom/msm_bus/msm_bus_rpm_smd.c
index 975b3bdad8fefd0ab4702f918c815c561836eb97..be64c78b7f1375b5d293ecfff4e2674b25035810 100644 (file)
--- a/drivers/soc/qcom/msm_bus/msm_bus_rpm_smd.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_rpm_smd.c
@@ -16,7 +16,7 @@
 #include "msm_bus_core.h"
 #include <linux/msm-bus.h>
 #include <linux/msm-bus-board.h>
-#include <linux/mfd/qcom-smd-rpm.h>
+#include <linux/soc/qcom/smd-rpm.h>
 
 /* Stubs for backward compatibility */
 void msm_bus_rpm_set_mt_mask()

diff --git a/drivers/soc/qcom/msm_bus/qcom_rpm_msm_bus.c b/drivers/soc/qcom/msm_bus/qcom_rpm_msm_bus.c
index e271406f064fa1fe343c10d81f69fcca20882820..cc786252223e133efa54e5e49e3144a98140debf 100644 (file)
--- a/drivers/soc/qcom/msm_bus/qcom_rpm_msm_bus.c
+++ b/drivers/soc/qcom/msm_bus/qcom_rpm_msm_bus.c
@@ -18,7 +18,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/msm-bus.h>
-#include <linux/mfd/qcom-smd-rpm.h>
+#include <linux/soc/qcom/smd-rpm.h>
 
 struct qcom_rpm_msm_bus_info {
        struct qcom_smd_rpm *rpm;