Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

[deliverable/linux.git] / arch / arm / mach-omap2 / pmu.c

diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c
index 3cf79b54ce61ac7fc3c72a0de6bc52a43e68f2a2..250d909e38bdf1204dd42c786b8e89f670b60f43 100644 (file)
--- a/arch/arm/mach-omap2/pmu.c
+++ b/arch/arm/mach-omap2/pmu.c
@@ -58,8 +58,6 @@ static int __init omap2_init_pmu(unsigned oh_num, char *oh_names[])
        if (IS_ERR(omap_pmu_dev))
                return PTR_ERR(omap_pmu_dev);
 
-       pm_runtime_enable(&omap_pmu_dev->dev);
-
        return 0;
 }