projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
583c377
)
ACPI: Fix a duplicate log level
author
Jean Delvare
<khali@linux-fr.org>
Wed, 27 Feb 2008 19:56:01 +0000
(20:56 +0100)
committer
Len Brown
<len.brown@intel.com>
Tue, 11 Mar 2008 04:52:19 +0000
(
00:52
-0400)
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/osl.c
patch
|
blob
|
history
diff --git
a/drivers/acpi/osl.c
b/drivers/acpi/osl.c
index
8edba7b
..
065819b
100644
(file)
--- a/
drivers/acpi/osl.c
+++ b/
drivers/acpi/osl.c
@@
-1237,7
+1237,7
@@
int acpi_check_resource_conflict(struct resource *res)
if (clash) {
if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
- printk(
KERN_INFO
"%sACPI: %s resource %s [0x%llx-0x%llx]"
+ printk("%sACPI: %s resource %s [0x%llx-0x%llx]"
" conflicts with ACPI region %s"
" [0x%llx-0x%llx]\n",
acpi_enforce_resources == ENFORCE_RESOURCES_LAX