summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorMichael Turquette <mturquette@baylibre.com>2016-07-15 19:15:40 -0700
committerMichael Turquette <mturquette@baylibre.com>2016-07-15 19:15:40 -0700
commit149f9e734f8d61d9ae2eb120ec83ed8131846003 (patch)
tree4f7f2a95fe91d2c17653fa0e412965470cda41a0 /drivers/clk
parent4d252fd5719bd047a178668aa09ee8bc9de85c7c (diff)
parentca1d2e269f593b318a75f3ffb9befc1ec8b6f2fd (diff)
downloadlinux-stable-149f9e734f8d61d9ae2eb120ec83ed8131846003.tar.gz
linux-stable-149f9e734f8d61d9ae2eb120ec83ed8131846003.tar.bz2
linux-stable-149f9e734f8d61d9ae2eb120ec83ed8131846003.zip
Merge branch 'clk-s905' into clk-next
Diffstat (limited to 'drivers/clk')
-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 8355ecd27b81..a2adf3448b59 100644
--- a/drivers/clk/meson/gxbb.h
+++ b/drivers/clk/meson/gxbb.h
@@ -234,7 +234,7 @@
#define CLKID_HDMI_PCLK 63
#define CLKID_USB1_DDR_BRIDGE 64
#define CLKID_USB0_DDR_BRIDGE 65
-/* CLKID_MMC_PCLK */
+#define CLKID_MMC_PCLK 66
#define CLKID_DVIN 67
#define CLKID_UART2 68
#define CLKID_SANA 69