diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2020-08-03 23:52:05 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2020-08-03 23:52:05 +0300 |
| commit | ba857b212210df018adb5885656c9e890062f883 (patch) | |
| tree | 6f3b54e33004117b757dfa17d609d47cd9cce583 /include/asm-generic/io.h | |
| parent | b545b9c393cb4486a7b70ef2fd8d0c8451872342 (diff) | |
| parent | 1e7468bd9d30a21e059af477106dc5588ae52dff (diff) | |
| download | linux-ba857b212210df018adb5885656c9e890062f883.tar.xz | |
Merge branch 'clk-fixes' into clk-kconfig
Need to merge this up to get the IOMEM dependency patch on top that is
broken and fixed in the next commit.
* clk-fixes:
clk: Specify IOMEM dependency for HSDK pll driver
clk: AST2600: Add mux for EMMC clock
clk: mvebu: ARMADA_AP_CPU_CLK needs to select ARMADA_AP_CP_HELPER
Diffstat (limited to 'include/asm-generic/io.h')
0 files changed, 0 insertions, 0 deletions