diff options
| author | Jeremy Katz <katzj@redhat.com> | 2008-09-23 21:54:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-24 09:33:58 +0200 |
| commit | 77a9a768b7374cd23d1f400097eede9f1547f508 (patch) | |
| tree | 7deeabe82bc7dfc60b378e0ac3379e52d540b483 /arch | |
| parent | fb478da5ba69ecf40729ae8ab37ca406b1e5be48 (diff) | |
| download | linux-stable-77a9a768b7374cd23d1f400097eede9f1547f508.tar.gz linux-stable-77a9a768b7374cd23d1f400097eede9f1547f508.tar.bz2 linux-stable-77a9a768b7374cd23d1f400097eede9f1547f508.zip | |
x86: disable apm on the olpc
The OLPC doesn't support APM but also doesn't have DMI, so we can't detect
and disable it based on DMI data. So, just disable based on machine_is_olpc()
Signed-off-by: Jeremy Katz <katzj@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apm_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 9ee24e6bc4b0..732d1f4e10ee 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -234,6 +234,7 @@ #include <asm/uaccess.h> #include <asm/desc.h> #include <asm/i8253.h> +#include <asm/olpc.h> #include <asm/paravirt.h> #include <asm/reboot.h> @@ -2217,7 +2218,7 @@ static int __init apm_init(void) dmi_check_system(apm_dmi_table); - if (apm_info.bios.version == 0 || paravirt_enabled()) { + if (apm_info.bios.version == 0 || paravirt_enabled() || machine_is_olpc()) { printk(KERN_INFO "apm: BIOS not found.\n"); return -ENODEV; } |