diff --git a/[refs] b/[refs] index a689f7f9779a..5c6391a06fb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10b3ecdbd4a54d682903daff99fa6066e6cb68c2 +refs/heads/master: 1934dae220ed1f1a832a191a86c1becfcbb3a094 diff --git a/trunk/drivers/mfd/db8500-prcmu.c b/trunk/drivers/mfd/db8500-prcmu.c index 91a5e8cce051..98da431af044 100644 --- a/trunk/drivers/mfd/db8500-prcmu.c +++ b/trunk/drivers/mfd/db8500-prcmu.c @@ -2154,7 +2154,7 @@ void __init db8500_prcmu_early_init(void) } } -static void __init init_prcm_registers(void) +static void __init db8500_prcmu_init_clkforce(void) { u32 val; @@ -2412,7 +2412,7 @@ static int __init db8500_prcmu_probe(struct platform_device *pdev) if (ux500_is_svp()) return -ENODEV; - init_prcm_registers(); + db8500_prcmu_init_clkforce(); /* Clean up the mailbox interrupts after pre-kernel code. */ writel(ALL_MBOX_BITS, PRCM_ARM_IT1_CLR);