From c56f3763bcccac5524327ac7477d35235312d112 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 31 Jan 2012 16:36:08 -0300 Subject: [PATCH] --- yaml --- r: 297027 b: refs/heads/master c: b877763ea01d740f6c62a35c45b7351fec9c288d h: refs/heads/master i: 297025: 88b191f8873d0fb2b3a943ec7a91f2e6954d5ccc 297023: 8baa74b84a9365791938ea6a352af6bf1f1f37e4 v: v3 --- [refs] | 2 +- trunk/drivers/edac/ppc4xx_edac.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a89f0d4d9211..456c0c9744cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b889e379f340f43b1252abde5d37a7084c846b9 +refs/heads/master: b877763ea01d740f6c62a35c45b7351fec9c288d diff --git a/trunk/drivers/edac/ppc4xx_edac.c b/trunk/drivers/edac/ppc4xx_edac.c index fc757069c6af..d427c69bb8b1 100644 --- a/trunk/drivers/edac/ppc4xx_edac.c +++ b/trunk/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 */