diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-24 12:31:18 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-24 12:31:18 +1100 |
commit | add902e5b0ec4c0f19c8fb255ad800d40e6cc01a (patch) | |
tree | 952e9138673a59acca5b1808765e58540767e9b0 /drivers/edac/mpc85xx_edac.c | |
parent | 27e1a1abb39177a99d2f55ab70255fcab4132f50 (diff) | |
parent | 7bcd547ab98aff3ebf955cc59d976bc873fd3822 (diff) |
Merge branch 'quilt/driver-core'
Diffstat (limited to 'drivers/edac/mpc85xx_edac.c')
-rw-r--r-- | drivers/edac/mpc85xx_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 853ef37ec006..4637a4a757df 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c @@ -218,7 +218,7 @@ static int __devinit mpc85xx_pci_err_probe(struct of_device *op, pci->dev = &op->dev; pci->mod_name = EDAC_MOD_STR; pci->ctl_name = pdata->name; - pci->dev_name = op->dev.bus_id; + pci->dev_name = dev_name(&op->dev); if (edac_op_state == EDAC_OPSTATE_POLL) pci->edac_check = mpc85xx_pci_check; |