diff options
| author | Olaf Hering <olaf@aepfle.de> | 2007-08-25 05:42:01 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-25 16:58:27 +1000 |
| commit | e120e8d03a263cf75f2abc0f8b3a03a65cfd3b88 (patch) | |
| tree | f40073074e3ce5c19864387a44f6d6faf17bc21f /include/linux/pmu.h | |
| parent | b22ddc703c5daa603d8d53881b530da3cab94cd4 (diff) | |
| download | linux-e120e8d03a263cf75f2abc0f8b3a03a65cfd3b88.tar.gz linux-e120e8d03a263cf75f2abc0f8b3a03a65cfd3b88.tar.bz2 linux-e120e8d03a263cf75f2abc0f8b3a03a65cfd3b88.zip | |
[POWERPC] Fix undefined reference to device_power_up/resume
Current Linus tree fails to link on pmac32:
drivers/built-in.o: In function `pmac_wakeup_devices':
via-pmu.c:(.text+0x5bab4): undefined reference to `device_power_up'
via-pmu.c:(.text+0x5bb08): undefined reference to `device_resume'
drivers/built-in.o: In function `pmac_suspend_devices':
via-pmu.c:(.text+0x5c260): undefined reference to `device_power_down'
via-pmu.c:(.text+0x5c27c): undefined reference to `device_resume'
make[1]: *** [.tmp_vmlinux1] Error 1
changing CONFIG_PM > CONFIG_PM_SLEEP leads to:
drivers/built-in.o: In function `pmu_led_set':
via-pmu-led.c:(.text+0x5cdca): undefined reference to `pmu_sys_suspended'
via-pmu-led.c:(.text+0x5cdce): undefined reference to `pmu_sys_suspended'
drivers/built-in.o: In function `pmu_req_done':
via-pmu-led.c:(.text+0x5ce3e): undefined reference to `pmu_sys_suspended'
via-pmu-led.c:(.text+0x5ce42): undefined reference to `pmu_sys_suspended'
drivers/built-in.o: In function `adb_init':
(.init.text+0x4c5c): undefined reference to `pmu_register_sleep_notifier'
make[1]: *** [.tmp_vmlinux1] Error 1
So change even more places from PM to PM_SLEEP to allow linking.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/linux/pmu.h')
| -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 5ad913ff02b2..b7824c215354 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 */ |