--- zzzz-none-000/linux-2.6.19.2/arch/sparc64/kernel/isa.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/sparc64/kernel/isa.c	2007-01-19 15:11:30.000000000 +0000
@@ -111,12 +111,12 @@
 		isa_dev->ofdev.node = dp;
 		isa_dev->ofdev.dev.parent = &isa_br->ofdev.dev;
 		isa_dev->ofdev.dev.bus = &isa_bus_type;
-		sprintf(isa_dev->ofdev.dev.bus_id, "isa[%08x]", dp->node);
+		strcpy(isa_dev->ofdev.dev.bus_id, dp->path_component_name);
 
 		/* Register with core */
 		if (of_device_register(&isa_dev->ofdev) != 0) {
 			printk(KERN_DEBUG "isa: device registration error for %s!\n",
-			       dp->path_component_name);
+			       isa_dev->ofdev.dev.bus_id);
 			kfree(isa_dev);
 			goto next_sibling;
 		}
@@ -187,12 +187,12 @@
 		isa_br->ofdev.node = dp;
 		isa_br->ofdev.dev.parent = &pdev->dev;
 		isa_br->ofdev.dev.bus = &isa_bus_type;
-		sprintf(isa_br->ofdev.dev.bus_id, "isa%d", index);
+		strcpy(isa_br->ofdev.dev.bus_id, dp->path_component_name);
 
 		/* Register with core */
 		if (of_device_register(&isa_br->ofdev) != 0) {
 			printk(KERN_DEBUG "isa: device registration error for %s!\n",
-			       dp->path_component_name);
+			       isa_br->ofdev.dev.bus_id);
 			kfree(isa_br);
 			return;
 		}