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 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
of_device.c
diff --git
a/arch/powerpc/kernel/of_device.c
b/arch/powerpc/kernel/of_device.c
index
fa983a5
..
a359cb0
100644
(file)
--- a/
arch/powerpc/kernel/of_device.c
+++ b/
arch/powerpc/kernel/of_device.c
@@
-76,7
+76,7
@@
struct of_device *of_device_alloc(struct device_node *np,
dev->dev.archdata.of_node = np;
if (bus_id)
- dev_set_name(&dev->dev, bus_id);
+ dev_set_name(&dev->dev,
"%s",
bus_id);
else
of_device_make_bus_id(dev);