Merge branch 'core/softlockup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6-omap-h63xx.git] / drivers / edac / edac_device.c

diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 4041e91432837b2d2cc9b898e10f04f20cc778ce..ca9113e1c1060ad9195d7cba55a35d70ed007f20 100644 (file)
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -333,7 +333,7 @@ static int add_edac_dev_to_global_list(struct edac_device_ctl_info *edac_dev)
 fail0:
        edac_printk(KERN_WARNING, EDAC_MC,
                        "%s (%s) %s %s already assigned %d\n",
-                       rover->dev->bus_id, edac_dev_name(rover),
+                       dev_name(rover->dev), edac_dev_name(rover),
                        rover->mod_name, rover->ctl_name, rover->dev_idx);
        return 1;