summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-05-09 18:19:51 +0200
committerPaul Mackerras <paulus@samba.org>2007-05-10 13:28:13 +0200
commit49d687b636c1f7e9a14faab7bd654f9fb88ecd11 (patch)
treeeded43f542a7245f45de34609d158dcfad7c3f82
parent[POWERPC] Fix incorrect calculation of I/O window addresses (diff)
downloadlinux-49d687b636c1f7e9a14faab7bd654f9fb88ecd11.tar.xz
linux-49d687b636c1f7e9a14faab7bd654f9fb88ecd11.zip
[POWERPC] pmu_sys_suspended is only defined for PPC32
thus we get a link error on ppc64 with CONFIG_PM=y. This fixes it. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--include/linux/pmu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pmu.h b/include/linux/pmu.h
index 37ca57392add..5ad913ff02b2 100644
--- a/include/linux/pmu.h
+++ b/include/linux/pmu.h
@@ -226,7 +226,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 */
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
extern int pmu_sys_suspended;
#else
/* if power management is not configured it can't be suspended */