diff options
-rw-r--r-- | drivers/acpi/hardware/hwregs.c | 2 | ||||
-rw-r--r-- | include/acpi/aclocal.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c index 3143f36fcec9..fa58c1edce1e 100644 --- a/drivers/acpi/hardware/hwregs.c +++ b/drivers/acpi/hardware/hwregs.c | |||
@@ -665,8 +665,6 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value) | |||
665 | 665 | ||
666 | /* | 666 | /* |
667 | * Perform a read first to preserve certain bits (per ACPI spec) | 667 | * Perform a read first to preserve certain bits (per ACPI spec) |
668 | * | ||
669 | * Note: This includes SCI_EN, we never want to change this bit | ||
670 | */ | 668 | */ |
671 | status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK, | 669 | status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK, |
672 | ACPI_REGISTER_PM1_CONTROL, | 670 | ACPI_REGISTER_PM1_CONTROL, |
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h index a4d0e73d5aca..063c4b54290f 100644 --- a/include/acpi/aclocal.h +++ b/include/acpi/aclocal.h | |||
@@ -708,7 +708,7 @@ struct acpi_bit_register_info { | |||
708 | * must be preserved. | 708 | * must be preserved. |
709 | */ | 709 | */ |
710 | #define ACPI_PM1_STATUS_PRESERVED_BITS 0x0800 /* Bit 11 */ | 710 | #define ACPI_PM1_STATUS_PRESERVED_BITS 0x0800 /* Bit 11 */ |
711 | #define ACPI_PM1_CONTROL_PRESERVED_BITS 0x0201 /* Bit 9, Bit 0 (SCI_EN) */ | 711 | #define ACPI_PM1_CONTROL_PRESERVED_BITS 0x0200 /* Bit 9 (whatever) */ |
712 | 712 | ||
713 | /* | 713 | /* |
714 | * Register IDs | 714 | * Register IDs |