Commit 88d5fe03 authored Jan 17, 2014 by Stephen Boyd Committed by Mike Turquette Jan 27, 2014

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>

parent 9d43dc7f

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,7 @@
	#define EXTPCLK_CLK_SRC 40		#define EXTPCLK_CLK_SRC 40
	#define HDMI_CLK_SRC 41		#define HDMI_CLK_SRC 41
	#define VSYNC_CLK_SRC 42		#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_AHB_CLK 44
	#define CAMSS_CCI_CCI_CLK 45		#define CAMSS_CCI_CCI_CLK 45
	#define CAMSS_CSI0_AHB_CLK 46		#define CAMSS_CSI0_AHB_CLK 46