projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream-fixes
[powerpc.git]
/
include
/
acpi
/
aclocal.h
diff --git
a/include/acpi/aclocal.h
b/include/acpi/aclocal.h
index
a4d0e73
..
063c4b5
100644
(file)
--- a/
include/acpi/aclocal.h
+++ b/
include/acpi/aclocal.h
@@
-708,7
+708,7
@@
struct acpi_bit_register_info {
* must be preserved.
*/
#define ACPI_PM1_STATUS_PRESERVED_BITS 0x0800 /* Bit 11 */
-#define ACPI_PM1_CONTROL_PRESERVED_BITS 0x020
1 /* Bit 9, Bit 0 (SCI_EN
) */
+#define ACPI_PM1_CONTROL_PRESERVED_BITS 0x020
0 /* Bit 9 (whatever
) */
/*
* Register IDs