From: jbrunet <jbrunet@baylibre.com>
Date: Thu, 26 Jan 2017 16:05:49 +0000 (+0100)
Subject: clk: gxbb: fix CLKID_ETH defined twice
X-Git-Tag: v4.11-rc1~12^2~3^2^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2d3b74d3836901c8601e147b1ae24170f9fa2982;p=karo-tx-linux.git

clk: gxbb: fix CLKID_ETH defined twice

CLKID_ETH is define in the dt-bindings but has not be commented out in the
clock driver. Just do it now.

Fixes: 738f66d3211d ("clk: gxbb: add AmLogic GXBB clk controller driver")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---

diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h
index dc487180f847..8ee2022ce5d5 100644
--- a/drivers/clk/meson/gxbb.h
+++ b/drivers/clk/meson/gxbb.h
@@ -204,7 +204,7 @@
 #define CLKID_ASSIST_MISC	  33
 /* CLKID_SPI */
 #define CLKID_I2S_SPDIF		  35
-#define CLKID_ETH		  36
+/* CLKID_ETH */
 #define CLKID_DEMUX		  37
 #define CLKID_AIU_GLUE		  38
 #define CLKID_IEC958		  39