summaryrefslogtreecommitdiffstats
path: root/drivers/clk/meson
diff options
context:
space:
mode:
authorjbrunet <jbrunet@baylibre.com>2017-01-26 17:05:49 +0100
committerKevin Hilman <khilman@baylibre.com>2017-01-27 10:56:57 -0800
commit2d3b74d3836901c8601e147b1ae24170f9fa2982 (patch)
treef00747c2ba185f8a29c9629f06f9bc96267eba55 /drivers/clk/meson
parent7eea67101b9713ae438955e8899b3c4b078419f9 (diff)
downloadlinux-stable-2d3b74d3836901c8601e147b1ae24170f9fa2982.tar.gz
linux-stable-2d3b74d3836901c8601e147b1ae24170f9fa2982.tar.bz2
linux-stable-2d3b74d3836901c8601e147b1ae24170f9fa2982.zip
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/clk/meson')
-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 @@
#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