---

yaml --- r: 200391 b: refs/heads/master c: 9d3c752 h: refs/heads/master i: 200389: 054e1e0 200387: 3b0c8ce 200383: 9a1891d v: v3
git-mirror · Jun 12, 2010 · 91ae216 · 91ae216
1 parent 41472bc
commit 91ae216
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce43ace02320a3fb9614ddb27edc3a8700d68b26
+refs/heads/master: 9d3c752de65dbfa6e522f1d666deb0ac152ef367
diff --git a/trunk/drivers/acpi/system.c b/trunk/drivers/acpi/system.c
@@ -388,10 +388,12 @@ static ssize_t counter_set(struct kobject *kobj,
 	if (index < num_gpes) {
 		if (!strcmp(buf, "disable\n") &&
 				(status & ACPI_EVENT_FLAG_ENABLED))
-			result = acpi_set_gpe(handle, index, ACPI_GPE_DISABLE);
+			result = acpi_disable_gpe(handle, index,
+						ACPI_GPE_TYPE_RUNTIME);
 		else if (!strcmp(buf, "enable\n") &&
 				!(status & ACPI_EVENT_FLAG_ENABLED))
-			result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE);
+			result = acpi_enable_gpe(handle, index,
+						ACPI_GPE_TYPE_RUNTIME);
 		else if (!strcmp(buf, "clear\n") &&
 				(status & ACPI_EVENT_FLAG_SET))
 			result = acpi_clear_gpe(handle, index);