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 branch 'master' of git://git.infradead.org/users/linville/wireless into for...
[pandora-kernel.git]
/
drivers
/
acpi
/
acpica
/
acconfig.h
diff --git
a/drivers/acpi/acpica/acconfig.h
b/drivers/acpi/acpica/acconfig.h
index
bc533dd
..
f895a24
100644
(file)
--- a/
drivers/acpi/acpica/acconfig.h
+++ b/
drivers/acpi/acpica/acconfig.h
@@
-121,7
+121,7
@@
/* Maximum sleep allowed via Sleep() operator */
-#define ACPI_MAX_SLEEP 2000
0
/* Two seconds */
+#define ACPI_MAX_SLEEP 2000
/* Two seconds */
/******************************************************************************
*