git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linux-2.6
[pandora-kernel.git]
/
drivers
/
acpi
/
ac.c
diff --git
a/drivers/acpi/ac.c
b/drivers/acpi/ac.c
index
96309b9
..
11abc7b
100644
(file)
--- a/
drivers/acpi/ac.c
+++ b/
drivers/acpi/ac.c
@@
-285,6
+285,8
@@
static int __init acpi_ac_init(void)
{
int result;
+ if (acpi_disabled)
+ return -ENODEV;
acpi_ac_dir = acpi_lock_ac_dir();
if (!acpi_ac_dir)