commit 88d5fe037dad80bbaf64a5c6eccd9605fcedf2e0
author Stephen Boyd <sboyd@codeaurora.org> Fri Jan 17 17:05:19 2014 -0800
committer Mike Turquette <mturquette@linaro.org> Mon Jan 27 11:27:04 2014 -0800
tree a6619e72261e7988759bac3f21105195a3ed9044
parent 9d43dc7f403dbe5da25c7eb488a5975b08d95496

dt-bindings: qcom: Fix warning with duplicate dt define

arch/arm/boot/dts/include/dt-bindings/clock/qcom,mmcc-msm8974.h:60:0:
warning: "RBCPR_CLK_SRC" redefined

Rename this to MMSS_RBCPR_CLK_SRC to avoid conflicts with the
RBCPR clock in the gcc header.

Reported-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

include/dt-bindings/clock/qcom,mmcc-msm8974.h

diff --git a/include/dt-bindings/clock/qcom,mmcc-msm8974.h b/include/dt-bindings/clock/qcom,mmcc-msm8974.h
index 04d318d..032ed87 100644
--- a/include/dt-bindings/clock/qcom,mmcc-msm8974.h
+++ b/include/dt-bindings/clock/qcom,mmcc-msm8974.h
@@ -57,7 +57,7 @@
 #define EXTPCLK_CLK_SRC					40
 #define HDMI_CLK_SRC					41
 #define VSYNC_CLK_SRC					42
-#define RBCPR_CLK_SRC					43
+#define MMSS_RBCPR_CLK_SRC				43
 #define CAMSS_CCI_CCI_AHB_CLK				44
 #define CAMSS_CCI_CCI_CLK				45
 #define CAMSS_CSI0_AHB_CLK				46