---

yaml --- r: 39276 b: refs/heads/master c: 53a5fbd h: refs/heads/master v: v3
git-mirror · Oct 11, 2006 · 3c961cc · 3c961cc
1 parent f51c405
commit 3c961cc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0968cf51b6f2ca8a951de4b976370189cf43bbdd
+refs/heads/master: 53a5fbdc2dff55161a206ed1a1385a8fa8055c34
diff --git a/trunk/drivers/acpi/hardware/hwregs.c b/trunk/drivers/acpi/hardware/hwregs.c
@@ -665,8 +665,6 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
 
 		/*
 		 * Perform a read first to preserve certain bits (per ACPI spec)
-		 *
-		 * Note: This includes SCI_EN, we never want to change this bit
 		 */
 		status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
 					       ACPI_REGISTER_PM1_CONTROL,

diff --git a/trunk/include/acpi/aclocal.h b/trunk/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         0x0201	/* Bit 9, Bit 0 (SCI_EN) */
+#define ACPI_PM1_CONTROL_PRESERVED_BITS         0x0200	/* Bit 9 (whatever) */
 
 /*
  * Register IDs