git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[pandora-kernel.git]
/
drivers
/
acpi
/
bus.c
diff --git
a/drivers/acpi/bus.c
b/drivers/acpi/bus.c
index
e8f7b64
..
ae862f1
100644
(file)
--- a/
drivers/acpi/bus.c
+++ b/
drivers/acpi/bus.c
@@
-312,7
+312,7
@@
int acpi_bus_set_power(acpi_handle handle, int state)
end:
if (result)
printk(KERN_WARNING PREFIX
- "
Transitioning device [%s]
to D%d\n",
+ "
Device [%s] failed to transition
to D%d\n",
device->pnp.bus_id, state);
else {
device->power.state = state;