lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: disable apm on the olpc
This commit is contained in:
Linus Torvalds
2008-09-29 08:39:59 -07:00
parent 4efb686205 77a9a768b7
commit bf5cb66447
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/apm_32.c
View File

@@ -234,6 +234,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/desc.h> #include <asm/desc.h>
#include <asm/i8253.h> #include <asm/i8253.h>
#include <asm/olpc.h>
#include <asm/paravirt.h> #include <asm/paravirt.h>
#include <asm/reboot.h> #include <asm/reboot.h>
@@ -2217,7 +2218,7 @@ static int __init apm_init(void)
dmi_check_system(apm_dmi_table); 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"); printk(KERN_INFO "apm: BIOS not found.\n");
return -ENODEV; return -ENODEV;
} }