--- zzzz-none-000/linux-2.6.19.2/drivers/sbus/sbus.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/sbus/sbus.c	2007-01-11 07:38:19.000000000 +0000
@@ -61,11 +61,11 @@
 	else
 		sdev->ofdev.dev.parent = &sdev->bus->ofdev.dev;
 	sdev->ofdev.dev.bus = &sbus_bus_type;
-	sprintf(sdev->ofdev.dev.bus_id, "sbus[%08x]", dp->node);
+	strcpy(sdev->ofdev.dev.bus_id, dp->path_component_name);
 
 	if (of_device_register(&sdev->ofdev) != 0)
 		printk(KERN_DEBUG "sbus: device registration error for %s!\n",
-		       dp->path_component_name);
+		       sdev->ofdev.dev.bus_id);
 }
 
 static void __init sbus_bus_ranges_init(struct device_node *dp, struct sbus_bus *sbus)