diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 15:37:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 15:37:07 -0500 |
| commit | 5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231 (patch) | |
| tree | 29dd80a7b33426d0890aa07b5864224557c62af7 /arch/sparc/kernel/of_device.c | |
| parent | 0bb943c7a2136716757a263f604d26309fd98042 (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'arch/sparc/kernel/of_device.c')
| -rw-r--r-- | arch/sparc/kernel/of_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index 0837bd52e28f..0a83bd737654 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c | |||
| @@ -563,9 +563,9 @@ build_resources: | |||
| 563 | op->dev.parent = parent; | 563 | op->dev.parent = parent; |
| 564 | op->dev.bus = &of_platform_bus_type; | 564 | op->dev.bus = &of_platform_bus_type; |
| 565 | if (!parent) | 565 | if (!parent) |
| 566 | strcpy(op->dev.bus_id, "root"); | 566 | dev_set_name(&op->dev, "root"); |
| 567 | else | 567 | else |
| 568 | sprintf(op->dev.bus_id, "%08x", dp->node); | 568 | dev_set_name(&op->dev, "%08x", dp->node); |
| 569 | 569 | ||
| 570 | if (of_device_register(op)) { | 570 | if (of_device_register(op)) { |
| 571 | printk("%s: Could not register of device.\n", | 571 | printk("%s: Could not register of device.\n", |