Merge remote-tracking branch 'md/for-next'

[karo-tx-linux.git] / arch / arm / mach-imx / mach-imx6q.c

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 9602cc12d2f1014efbac3887dc49278191745c67..3878494bd11827756150235f404e86cb520a14a0 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -350,7 +350,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;
        }