---

yaml --- r: 291887 b: refs/heads/master c: 615a445 h: refs/heads/master i: 291885: f11ae3f 291883: 6649ba5 291879: 70dad62 291871: 3beb60f v: v3
git-mirror · Mar 16, 2012 · fcda23a · fcda23a
1 parent 3567c99
commit fcda23a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ee619f9487c2acc1efdf2c78e68e2bd51b635fa
+refs/heads/master: 615a445f7f8a077c145e737864ae59a4d8717882
diff --git a/trunk/drivers/clocksource/sh_cmt.c b/trunk/drivers/clocksource/sh_cmt.c
@@ -32,6 +32,7 @@
 #include <linux/sh_timer.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/pm_domain.h>
 
 struct sh_cmt_priv {
 	void __iomem *mapbase;
@@ -689,6 +690,9 @@ static int __devinit sh_cmt_probe(struct platform_device *pdev)
 	struct sh_cmt_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;