diff options
author | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:51 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:51 -0400 |
commit | bcb631f31839cb7c7dd56ab534b6eb4867e9161b (patch) | |
tree | d86336c9cfb22e4af69fbe73c94299a775ecc220 /drivers/acpi/system.c | |
parent | 955ba395616a78780e70dc3f3b0b56ca4db52e5c (diff) | |
parent | ed37a71eac8ba375d85ab10ed5f5e8bdf1cd72e0 (diff) |
Merge branch 'acpica' into test
Diffstat (limited to 'drivers/acpi/system.c')
-rw-r--r-- | drivers/acpi/system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index 91dec448b3ed..3eefd6d029f9 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
@@ -387,8 +387,8 @@ static ssize_t counter_set(struct kobject *kobj, | |||
387 | goto end; | 387 | goto end; |
388 | 388 | ||
389 | if (!(all_counters[index].flags & ACPI_EVENT_VALID)) { | 389 | if (!(all_counters[index].flags & ACPI_EVENT_VALID)) { |
390 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, | 390 | printk(KERN_WARNING PREFIX |
391 | "Can not change Invalid GPE/Fixed Event status\n")); | 391 | "Can not change Invalid GPE/Fixed Event status\n"); |
392 | return -EINVAL; | 392 | return -EINVAL; |
393 | } | 393 | } |
394 | 394 | ||