aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-24 01:34:52 -0400
committerLen Brown <len.brown@intel.com>2009-04-24 01:34:52 -0400
commit7f3745ad7aca48b946136e3173861821fa8b24c5 (patch)
tree35e3cfb55103a5ae62b24dd37d5afa76ee53255b /drivers/acpi
parent771e5ce3bd96f315e213f6263e40b2b2ee7e5201 (diff)
parent53005a0a1b53bda5810c45efe3025d1884aa6bb3 (diff)
Merge branch 'sony-laptop' into release
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/ec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 04e90443eff7..391f331674c7 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1065,6 +1065,7 @@ static int acpi_ec_resume(struct acpi_device *device)
1065 struct acpi_ec *ec = acpi_driver_data(device); 1065 struct acpi_ec *ec = acpi_driver_data(device);
1066 /* Enable use of GPE back */ 1066 /* Enable use of GPE back */
1067 clear_bit(EC_FLAGS_NO_GPE, &ec->flags); 1067 clear_bit(EC_FLAGS_NO_GPE, &ec->flags);
1068 set_bit(EC_FLAGS_GPE_MODE, &ec->flags);
1068 acpi_enable_gpe(NULL, ec->gpe); 1069 acpi_enable_gpe(NULL, ec->gpe);
1069 return 0; 1070 return 0;
1070} 1071}