diff options
Diffstat (limited to 'arch/x86/kernel/apm_32.c')
-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 b93d069aea72..5145a6e72bbb 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -233,6 +233,7 @@ | |||
233 | #include <asm/uaccess.h> | 233 | #include <asm/uaccess.h> |
234 | #include <asm/desc.h> | 234 | #include <asm/desc.h> |
235 | #include <asm/i8253.h> | 235 | #include <asm/i8253.h> |
236 | #include <asm/olpc.h> | ||
236 | #include <asm/paravirt.h> | 237 | #include <asm/paravirt.h> |
237 | #include <asm/reboot.h> | 238 | #include <asm/reboot.h> |
238 | 239 | ||
@@ -2216,7 +2217,7 @@ static int __init apm_init(void) | |||
2216 | 2217 | ||
2217 | dmi_check_system(apm_dmi_table); | 2218 | dmi_check_system(apm_dmi_table); |
2218 | 2219 | ||
2219 | if (apm_info.bios.version == 0 || paravirt_enabled()) { | 2220 | if (apm_info.bios.version == 0 || paravirt_enabled() || machine_is_olpc()) { |
2220 | printk(KERN_INFO "apm: BIOS not found.\n"); | 2221 | printk(KERN_INFO "apm: BIOS not found.\n"); |
2221 | return -ENODEV; | 2222 | return -ENODEV; |
2222 | } | 2223 | } |