Commit bf5cb664 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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
parents 4efb6862 77a9a768

arch/x86/kernel/apm_32.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}