diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-27 09:42:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-27 09:42:21 -0700 |
| commit | 96665822dc43957d4337509e138017dc1cb960b1 (patch) | |
| tree | 11e9a33e2f58c477db25e5a15f176534ed636d43 /include/linux | |
| parent | d96a2a5c6479342229416565944b56bc7a2b1a60 (diff) | |
| parent | 175587cca7447daf5a13e4a53d32360ed8cba804 (diff) | |
| download | kernel_samsung_smdk4412-96665822dc43957d4337509e138017dc1cb960b1.zip kernel_samsung_smdk4412-96665822dc43957d4337509e138017dc1cb960b1.tar.gz kernel_samsung_smdk4412-96665822dc43957d4337509e138017dc1cb960b1.tar.bz2 | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix SLB initialization at boot time
[POWERPC] Fix undefined reference to device_power_up/resume
[POWERPC] cell: Update cell_defconfig for 2.6.23
[POWERPC] axonram: Do not delete gendisks queue in error path
[POWERPC] axonram: Module modification for latest firmware API changes
[POWERPC] cell: Support pinhole-reset on IBM cell blades
[POWERPC] spu_manage: Use newer physical-id attribute
[POWERPC] pasemi: Another IOMMU bugfix for 64K PAGE_SIZE
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pmu.h b/include/linux/pmu.h index 5ad913f..b7824c2 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 */ -#if defined(CONFIG_PM) && defined(CONFIG_PPC32) +#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32) extern int pmu_sys_suspended; #else /* if power management is not configured it can't be suspended */ |