Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / edac / ppc4xx_edac.c

diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index fc757069c6af61672fdf51e3e471d9e0dddfa527..d427c69bb8b1ebf811b4aeadcf06ac532b3be4b1 100644 (file)
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -184,7 +184,7 @@ struct ppc4xx_ecc_status {
 
 /* Function Prototypes */
 
-static int ppc4xx_edac_probe(struct platform_device *device)
+static int ppc4xx_edac_probe(struct platform_device *device);
 static int ppc4xx_edac_remove(struct platform_device *device);
 
 /* Global Variables */
@@ -1068,7 +1068,7 @@ ppc4xx_edac_mc_init(struct mem_ctl_info *mci,
 
        mci->mod_name           = PPC4XX_EDAC_MODULE_NAME;
        mci->mod_ver            = PPC4XX_EDAC_MODULE_REVISION;
-       mci->ctl_name           = match->compatible,
+       mci->ctl_name           = ppc4xx_edac_match->compatible,
        mci->dev_name           = np->full_name;
 
        /* Initialize callbacks */