From patchwork Sun Jun 10 19:24:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Collins X-Patchwork-Id: 164965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id B8BD91007D3 for ; Fri, 15 Jun 2012 03:10:33 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SfDYv-00035Q-FA; Thu, 14 Jun 2012 17:10:25 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SfDYt-0002fM-Nr for kernel-team@lists.ubuntu.com; Thu, 14 Jun 2012 17:10:23 +0000 Received: by mail-pz0-f49.google.com with SMTP id m1so2942909dad.8 for ; Thu, 14 Jun 2012 10:10:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:in-reply-to:references:from:date:subject:to; bh=b0pqX3SOGO4VbrXcrPRAPo0V1d9hA/VpvkeKwgO0YN8=; b=D0s3Hd/stbucrOnaXq/ukxQURE4K5QtVEf5jNPrePRif7vIqsyH94Teg3Kbbev6z5h 1s7HX2XtgGIAkt9/OmbDZ+sLZ2scrQDP5VSx3CceajxvEM/M1PuSBMEk/FhPbNuXP6c2 V44HSAmsw6qvolnuCTiefRSbXpu9W+VqeswOqeiPiZv82BDj6C7ikANdbY6exLK4XWhe JcRKHUHeHncH6VhNitGqWHACPUH74utYiaWyUZA1K4bbtqT6U5Umj0jmONkaOxXPQhRd ILI42wG+ZoLnNGdir1WQYKIBLKF7unfBmgz5kNwbN0j/9LM/gpBEKE81KxMYYRnqoHGA wl5g== Received: by 10.68.129.167 with SMTP id nx7mr5861478pbb.80.1339693823244; Thu, 14 Jun 2012 10:10:23 -0700 (PDT) Received: from localhost (ip68-13-200-36.hr.hr.cox.net. [68.13.200.36]) by mx.google.com with ESMTPS id jz4sm10110189pbc.17.2012.06.14.10.10.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jun 2012 10:10:22 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Thu, 14 Jun 2012 13:10:16 -0400 Message-Id: <52353c1e66bfcc4afa9a6bc8a5c58891f6816806.1339693612.git.bcollins@ubuntu.com> In-Reply-To: References: From: Ben Collins Date: Sun, 10 Jun 2012 15:24:10 -0400 Subject: [PATCH 1/6] UBUNTU: [Upstream] EDAC: Fix compilation of mpc85xx_edac driver To: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Accepted upstream. Signed-off-by: Ben Collins --- drivers/edac/mpc85xx_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 4c40235..40a8c87 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c @@ -980,7 +980,7 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op) layers[1].type = EDAC_MC_LAYER_CHANNEL; layers[1].size = 1; layers[1].is_virt_csrow = false; - mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), sizeof(*pdata)); + mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers, sizeof(*pdata)); if (!mci) { devres_release_group(&op->dev, mpc85xx_mc_err_probe); return -ENOMEM;