From 8d0f51f4d1af1f724dc114b9af9eda1fc190ce90 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Tue, 13 Mar 2012 22:40:14 +0100 Subject: [PATCH] --- yaml --- r: 291888 b: refs/heads/master c: 57d13370cfaf6017c68981e66ff5b3bf20a2705c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/clocksource/sh_mtu2.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b8893dd6419c..48b2d985a894 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 615a445f7f8a077c145e737864ae59a4d8717882 +refs/heads/master: 57d13370cfaf6017c68981e66ff5b3bf20a2705c diff --git a/trunk/drivers/clocksource/sh_mtu2.c b/trunk/drivers/clocksource/sh_mtu2.c index db8d5955bad4..a2172f690418 100644 --- a/trunk/drivers/clocksource/sh_mtu2.c +++ b/trunk/drivers/clocksource/sh_mtu2.c @@ -31,6 +31,7 @@ #include #include #include +#include struct sh_mtu2_priv { void __iomem *mapbase; @@ -306,6 +307,9 @@ static int __devinit sh_mtu2_probe(struct platform_device *pdev) struct sh_mtu2_priv *p = platform_get_drvdata(pdev); int ret; + if (!is_early_platform_device(pdev)) + pm_genpd_dev_always_on(&pdev->dev, true); + if (p) { dev_info(&pdev->dev, "kept as earlytimer\n"); return 0;