diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
| commit | 89a01c51cbe3b6ae81008e8c91235be583df8c50 (patch) | |
| tree | 0f2e42652d8ebdfc6aeaa8f7c1b5b834f4a5d649 /drivers/clk/mmp/clk-of-mmp2.c | |
| parent | x86/dumpstack: Handle NULL stack pointer in show_trace_log_lvl() (diff) | |
| parent | x86/cpufeatures: Enable new AVX512 cpu features (diff) | |
| download | linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.tar.xz linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.zip | |
Merge branch 'x86/cpufeature' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/mmp/clk-of-mmp2.c')
| -rw-r--r-- | drivers/clk/mmp/clk-of-mmp2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/mmp/clk-of-mmp2.c b/drivers/clk/mmp/clk-of-mmp2.c index 3a51fff1b0e7..9adaf48aea23 100644 --- a/drivers/clk/mmp/clk-of-mmp2.c +++ b/drivers/clk/mmp/clk-of-mmp2.c @@ -313,7 +313,7 @@ static void __init mmp2_clk_init(struct device_node *np) } pxa_unit->apmu_base = of_iomap(np, 1); - if (!pxa_unit->mpmu_base) { + if (!pxa_unit->apmu_base) { pr_err("failed to map apmu registers\n"); return; } |