commit bf5cb66447e7d9f7f111c1d0ebb6d7c90ec24b4d
author Linus Torvalds <torvalds@linux-foundation.org> Mon Sep 29 08:39:59 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Sep 29 08:39:59 2008 -0700
tree 59d1cde4e83afd8768e866b8d4ed0c9d9b5ae29b
parent 4efb686205d5065f4e488e20fc858446b8ad7bb7
parent 77a9a768b7374cd23d1f400097eede9f1547f508

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

* '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

arch/x86/kernel/apm_32.c

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 9ee24e6..732d1f4 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 @@
 
 	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;
 	}