Merge branch 'parisc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[cascardo/linux.git] / drivers / edac / mpc85xx_edac.c

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index c548a80..ff05675 100644 (file)
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -170,7 +170,6 @@ static int mpc85xx_pci_err_probe(struct platform_device *op)
 
        pdata = pci->pvt_info;
        pdata->name = "mpc85xx_pci_err";
-       pdata->irq = NO_IRQ;
 
        plat_data = op->dev.platform_data;
        if (!plat_data) {
@@ -491,7 +490,6 @@ static int mpc85xx_l2_err_probe(struct platform_device *op)
 
        pdata = edac_dev->pvt_info;
        pdata->name = "mpc85xx_l2_err";
-       pdata->irq = NO_IRQ;
        edac_dev->dev = &op->dev;
        dev_set_drvdata(edac_dev->dev, edac_dev);
        edac_dev->ctl_name = pdata->name;
@@ -656,8 +654,8 @@ static const struct of_device_id mpc85xx_mc_err_of_match[] = {
 MODULE_DEVICE_TABLE(of, mpc85xx_mc_err_of_match);
 
 static struct platform_driver mpc85xx_mc_err_driver = {
-       .probe = mpc85xx_mc_err_probe,
-       .remove = mpc85xx_mc_err_remove,
+       .probe = fsl_mc_err_probe,
+       .remove = fsl_mc_err_remove,
        .driver = {
                .name = "mpc85xx_mc_err",
                .of_match_table = mpc85xx_mc_err_of_match,