From patchwork Tue Nov 15 22:52:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 125880 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 00694B723D for ; Wed, 16 Nov 2011 09:52:41 +1100 (EST) Received: by ozlabs.org (Postfix) id D2C47B6F97; Wed, 16 Nov 2011 09:52:32 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from mail-gx0-f202.google.com (mail-gx0-f202.google.com [209.85.161.202]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 53936B6F95 for ; Wed, 16 Nov 2011 09:52:31 +1100 (EST) Received: by ggnp4 with SMTP id p4so301098ggn.3 for ; Tue, 15 Nov 2011 14:52:28 -0800 (PST) Received: by 10.101.126.2 with SMTP id d2mr3358942ann.32.1321397548249; Tue, 15 Nov 2011 14:52:28 -0800 (PST) Received: from wpzn4.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id f15si10953497anq.1.2011.11.15.14.52.28 (version=TLSv1/SSLv3 cipher=AES128-SHA); Tue, 15 Nov 2011 14:52:28 -0800 (PST) Received: from wpaz1.hot.corp.google.com (wpaz1.hot.corp.google.com [172.24.198.65]) by wpzn4.hot.corp.google.com (Postfix) with ESMTPS id 341C51E004D; Tue, 15 Nov 2011 14:52:28 -0800 (PST) Received: from localhost.localdomain (akpm.mtv.corp.google.com [172.18.96.75]) by wpaz1.hot.corp.google.com with ESMTP id pAFMqMYB032421; Tue, 15 Nov 2011 14:52:26 -0800 Message-Id: <201111152252.pAFMqMYB032421@wpaz1.hot.corp.google.com> Subject: [patch 1/1] drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac To: benh@kernel.crashing.org From: akpm@linux-foundation.org Date: Tue, 15 Nov 2011 14:52:22 -0800 MIME-Version: 1.0 Cc: linuxppc-dev@ozlabs.org, akpm@linux-foundation.org, Shaohui.Xie@freescale.com X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org From: Shaohui Xie Subject: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac compatible in dts has been changed, so the driver needs to be updated accordingly. Signed-off-by: Shaohui Xie Cc: Kumar Gala Cc: Grant Likely Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton --- drivers/edac/mpc85xx_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/edac/mpc85xx_edac.c~drivers-edac-mpc85xx_edacc-fix-memory-controller-compatible-for-edac drivers/edac/mpc85xx_edac.c --- a/drivers/edac/mpc85xx_edac.c~drivers-edac-mpc85xx_edacc-fix-memory-controller-compatible-for-edac +++ a/drivers/edac/mpc85xx_edac.c @@ -1128,7 +1128,7 @@ static struct of_device_id mpc85xx_mc_er { .compatible = "fsl,p1020-memory-controller", }, { .compatible = "fsl,p1021-memory-controller", }, { .compatible = "fsl,p2020-memory-controller", }, - { .compatible = "fsl,p4080-memory-controller", }, + { .compatible = "fsl,qoriq-memory-controller", }, {}, }; MODULE_DEVICE_TABLE(of, mpc85xx_mc_err_of_match);