Merge branches 'acpi-button', 'acpica' and 'acpi-sysfs'

[sfrench/cifs-2.6.git] / drivers / acpi / button.c

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 25aba9b107dd51db522225b5171e7017a5a3ec9d..9ad8cdb58743b765a6daa615729d78745d70af30 100644 (file)
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -113,7 +113,7 @@ struct acpi_button {
 
 static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier);
 static struct acpi_device *lid_device;
-static u8 lid_init_state = ACPI_BUTTON_LID_INIT_OPEN;
+static u8 lid_init_state = ACPI_BUTTON_LID_INIT_METHOD;
 
 static unsigned long lid_report_interval __read_mostly = 500;
 module_param(lid_report_interval, ulong, 0644);