Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)
  Dynamic debug: fix pr_fmt() build error
  Dynamic debug: allow simple quoting of words
  dynamic debug: update docs
  dynamic debug: combine dprintk and dynamic printk
  sysfs: fix some bin_vm_ops errors
  kobject: don't block for each kobject_uevent
  sysfs: only allow one scheduled removal callback per kobj
  Driver core: Fix device_move() vs. dpm list ordering, v2
  Driver core: some cleanup on drivers/base/sys.c
  Driver core: implement uevent suppress in kobject
  vcs: hook sysfs devices into object lifetime instead of "binding"
  driver core: fix passing platform_data
  driver core: move platform_data into platform_device
  sysfs: don't block indefinitely for unmapped files.
  driver core: move knode_bus into private structure
  driver core: move knode_driver into private structure
  driver core: move klist_children into private structure
  driver core: create a private portion of struct device
  driver core: remove polling for driver_probe_done(v5)
  sysfs: reference sysfs_dirent from sysfs inodes
  ...

Fixed conflicts in drivers/sh/maple/maple.c manually

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 083ce8d0c63d..5131aaae8e03 100644
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -121,7 +121,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev)
         pdata->irq = NO_IRQ;
         platform_set_drvdata(pdev, pci);
         pci->dev = &pdev->dev;
-        pci->dev_name = pdev->dev.bus_id;
+        pci->dev_name = dev_name(&pdev->dev);
         pci->mod_name = EDAC_MOD_STR;
         pci->ctl_name = pdata->name;
 
@@ -294,7 +294,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev)
         pdata->irq = NO_IRQ;
         edac_dev->dev = &pdev->dev;
         platform_set_drvdata(pdev, edac_dev);
-        edac_dev->dev_name = pdev->dev.bus_id;
+        edac_dev->dev_name = dev_name(&pdev->dev);
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!r) {
@@ -462,7 +462,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev)
         pdata->irq = NO_IRQ;
         edac_dev->dev = &pdev->dev;
         platform_set_drvdata(pdev, edac_dev);
-        edac_dev->dev_name = pdev->dev.bus_id;
+        edac_dev->dev_name = dev_name(&pdev->dev);
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!r) {
@@ -713,7 +713,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, mci);
         pdata->name = "mv64x60_mc_err";
         pdata->irq = NO_IRQ;
-        mci->dev_name = pdev->dev.bus_id;
+        mci->dev_name = dev_name(&pdev->dev);
         pdata->edac_idx = edac_mc_idx++;
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);