mirror of
https://github.com/adulau/aha.git
synced 2025-01-01 13:46:24 +00:00
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>
This commit is contained in:
parent
fb478da5ba
commit
77a9a768b7
1 changed files with 2 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue