diff options
| author |   Michael Turquette <mturquette@baylibre.com> | 2016-07-07 20:06:30 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-07-07 20:06:30 -0700 |
| commit | a0fc8c4f4ca744432765dabc76ef642a19e197de (patch) | |
| tree | 699888c363d2ab323c599e04250318402c420568 /drivers/clk | |
| parent | clk: stm32f4: fix error handling (diff) | |
| parent | clk: gxbb: expose CLKID_MMC_PCLK (diff) | |
| download | linux-dev-a0fc8c4f4ca744432765dabc76ef642a19e197de.tar.xz linux-dev-a0fc8c4f4ca744432765dabc76ef642a19e197de.zip | |
Merge branch 'clk-s905' into clk-next
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/meson/gxbb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index a2adf3448b59..8355ecd27b81 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 -#define CLKID_MMC_PCLK 66 +/* CLKID_MMC_PCLK */ #define CLKID_DVIN 67 #define CLKID_UART2 68 #define CLKID_SANA 69 |