Merge branch 'pwm-dmtimer-fixes' into omap-for-v5.0/fixes-v2

[sfrench/cifs-2.6.git] / drivers / clocksource / timer-ti-dm.c

diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c
index 3ecf84706640b4a39736a8e3720ecb2b39ea9970..c364027638e1aeccdb02c76963ad3212a13096bc 100644 (file)
--- a/drivers/clocksource/timer-ti-dm.c
+++ b/drivers/clocksource/timer-ti-dm.c
@@ -868,7 +868,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
        timer->pdev = pdev;
 
        pm_runtime_enable(dev);
-       pm_runtime_irq_safe(dev);
 
        if (!timer->reserved) {
                ret = pm_runtime_get_sync(dev);
@@ -995,7 +994,6 @@ static struct platform_driver omap_dm_timer_driver = {
        },
 };
 
-early_platform_init("earlytimer", &omap_dm_timer_driver);
 module_platform_driver(omap_dm_timer_driver);
 
 MODULE_DESCRIPTION("OMAP Dual-Mode Timer Driver");