aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorjbrunet <jbrunet@baylibre.com>2017-01-26 11:05:49 -0500
committerKevin Hilman <khilman@baylibre.com>2017-01-27 13:56:57 -0500
commit2d3b74d3836901c8601e147b1ae24170f9fa2982 (patch)
treef00747c2ba185f8a29c9629f06f9bc96267eba55 /drivers
parent7eea67101b9713ae438955e8899b3c4b078419f9 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/meson/gxbb.h2
1 files changed, 1 insertions, 1 deletions
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 @@
204#define CLKID_ASSIST_MISC 33 204#define CLKID_ASSIST_MISC 33
205/* CLKID_SPI */ 205/* CLKID_SPI */
206#define CLKID_I2S_SPDIF 35 206#define CLKID_I2S_SPDIF 35
207#define CLKID_ETH 36 207/* CLKID_ETH */
208#define CLKID_DEMUX 37 208#define CLKID_DEMUX 37
209#define CLKID_AIU_GLUE 38 209#define CLKID_AIU_GLUE 38
210#define CLKID_IEC958 39 210#define CLKID_IEC958 39