---

yaml --- r: 87267 b: refs/heads/master c: 07c941d h: refs/heads/master i: 87265: 1195623 87263: 5be3c26 v: v3
git-mirror · Mar 12, 2008 · c305897 · c305897
1 parent a1d7df2
commit c305897
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 620a245978d007279bc5c7c64e15f5f63af9af98
+refs/heads/master: 07c941d00087581c9553661c2c4fb593da37f525
diff --git a/trunk/include/linux/pmu.h b/trunk/include/linux/pmu.h
@@ -192,7 +192,7 @@ extern unsigned int pmu_power_flags;
 extern void pmu_backlight_init(void);
 
 /* some code needs to know if the PMU was suspended for hibernation */
-#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
+#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
 extern int pmu_sys_suspended;
 #else
 /* if power management is not configured it can't be suspended */