diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 02:54:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 02:54:55 +0000 |
| commit | 493c987f7a352ca64fdb4dc03a21e24cbaf46f55 (patch) | |
| tree | 184cddc0925e082c0500afd042f92e9f340fe890 /arch/i386/kernel/apm.c | |
| parent | 2d25612a92c62b5708d6d43f38d28c6141173328 (diff) | |
Merge with Linux 2.4.0-pre3-test6.
Diffstat (limited to 'arch/i386/kernel/apm.c')
| -rw-r--r-- | arch/i386/kernel/apm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index c78a8f512..6a4eedf72 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -660,6 +660,7 @@ static void apm_power_off(void) #endif } +#ifdef CONFIG_APM_DO_ENABLE static int apm_enable_power_management(int enable) { u32 eax; @@ -675,6 +676,7 @@ static int apm_enable_power_management(int enable) apm_bios_info.flags |= APM_BIOS_DISABLED; return APM_SUCCESS; } +#endif static int apm_get_power_status(u_short *status, u_short *bat, u_short *life) { |