projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
[deliverable/linux.git]
/
arch
/
x86
/
kernel
/
apm_32.c
diff --git
a/arch/x86/kernel/apm_32.c
b/arch/x86/kernel/apm_32.c
index 9307f182fe3049f8e4f1c3d38bb9b1ebb3008d26..c7364bd633e1d8c1a346c69534ded295bc2ba48d 100644
(file)
--- a/
arch/x86/kernel/apm_32.c
+++ b/
arch/x86/kernel/apm_32.c
@@
-2267,7
+2267,7
@@
static int __init apm_init(void)
dmi_check_system(apm_dmi_table);
- if (apm_info.bios.version == 0 ||
paravirt_enabled() ||
machine_is_olpc()) {
+ if (apm_info.bios.version == 0 || machine_is_olpc()) {
printk(KERN_INFO "apm: BIOS not found.\n");
return -ENODEV;
}
This page took
0.121179 seconds
and
5
git commands to generate.