linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mturquette@linaro.org (Mike Turquette)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] dt-bindings: qcom: Fix warning with duplicate dt define
Date: Mon, 27 Jan 2014 11:30:58 -0800	[thread overview]
Message-ID: <20140127193058.4167.21739@quantum> (raw)
In-Reply-To: <1390007119-4544-1-git-send-email-sboyd@codeaurora.org>

Quoting Stephen Boyd (2014-01-17 17:05:19)
> 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>

Thanks for the fix. I've pulled this into part 2 of my pull request.

Regards,
Mike

> ---
>  include/dt-bindings/clock/qcom,mmcc-msm8974.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/dt-bindings/clock/qcom,mmcc-msm8974.h b/include/dt-bindings/clock/qcom,mmcc-msm8974.h
> index 04d318d1187a..032ed87ef0f3 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
> -- 
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
> 

      reply	other threads:[~2014-01-27 19:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-18  1:05 [PATCH] dt-bindings: qcom: Fix warning with duplicate dt define Stephen Boyd
2014-01-27 19:30 ` Mike Turquette [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140127193058.4167.21739@quantum \
    --to=mturquette@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).