diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-01 13:56:36 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-01 13:56:36 +0800 |
| commit | ffded77eacc0ffbf14f48e190ac45417102e1eea (patch) | |
| tree | 417415519fa82a61231f851b1e5445e10657e492 /arch/arm | |
| parent | 421a8ddd1fc901897eee73965b442af4b4dd7095 (diff) | |
| parent | 4f817df5117d28f1ffd8b9a906b70356f2b30132 (diff) | |
Merge branch 'v3.18/topic/OPPv2' into linux-linaro-lsk-v3.18
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index e21a693fc984..a973970dfe10 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -349,7 +349,7 @@ static void __init imx6q_opp_init(void) return; } - if (of_init_opp_table(cpu_dev)) { + if (dev_pm_opp_of_add_table(cpu_dev)) { pr_warn("failed to init OPP table\n"); goto put_node; } |