From patchwork Fri Oct 26 20:53:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1653871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 6F217DF2F6 for ; Fri, 26 Oct 2012 20:57:47 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TRqwl-0003xX-RE; Fri, 26 Oct 2012 20:56:03 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TRqwh-0003wg-Vz for linux-arm-kernel@lists.infradead.org; Fri, 26 Oct 2012 20:56:00 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0MTrXg-1Ts9DG23xQ-00QoiZ; Fri, 26 Oct 2012 22:53:14 +0200 From: Arnd Bergmann To: Nicolas Ferre Subject: Re: [GIT PULL] at91: fixes for 3.7-rc3 Date: Fri, 26 Oct 2012 20:53:11 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <5088F131.5040600@atmel.com> In-Reply-To: <5088F131.5040600@atmel.com> MIME-Version: 1.0 Message-Id: <201210262053.11498.arnd@arndb.de> X-Provags-ID: V02:K0:SFo9/Aeb0zMvO0LFv1XNp7m0TqfPG0o9uCHPIlK85+g ylW0E2dZDkWKOzW4Nuqb+hQmAlEAxB5wv39C6ytNjl7FdYZnfe D5iw7VZuJwt5E1fm1BjLu8uP9NvOdGd+jF6qhv+cfAzX6Sc45F jQ66tI8xaz6iL6GmWN3yHSL7E3Zu0r7MW1h7PVf9ad3fxfFbZd ALP68BObczMocMLZ0FO1jVbML0ft3RsDYsT0/I7oxIzp9C9GxQ +gLPBuiqGx2IwG1LeqTFoHHqbg3zTeiMvr4kev/GFLuOmSLxAC 4puPcXu+m01hvPqkVaXQW762RNdh+mVrlLDYBaa1PqFNbE48mp /Ds233O28x+7RmwuNnIE= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: marek.belisko@open-nandra.com, ivan.shugov@gmail.com, Linux Kernel list , "Wu, Josh" , Ludovic Desroches , voice , Olof Johansson , Jean-Christophe PLAGNIOL-VILLARD , linux-arm-kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Thursday 25 October 2012, Nicolas Ferre wrote: > ARM: at91: fix external interrupts in non-DT case This patch now leads to build errors with at91x40_defconfig, which I've fixed up by applying the patch below on top. Please yell if this is not the right fix. Arnd commit 3a8852afde01682083028ee427e0678f9bbddd75 Author: Arnd Bergmann Date: Fri Oct 26 22:49:09 2012 +0200 ARM: at91: fix at91x40 build patch 738a0fd7 "ARM: at91: fix external interrupts in non-DT case" fixed a run-time error on some at91 platforms but did not apply the same change to at91x40, which now doesn't build. This changes at91x40 in the same way that the other platforms were changed. Signed-off-by: Arnd Bergmann Acked-by: Jean-Christophe PLAGNIOL-VILLARD diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c index 6bd7300..bb7f544 100644 --- a/arch/arm/mach-at91/at91x40.c +++ b/arch/arm/mach-at91/at91x40.c @@ -88,6 +88,6 @@ void __init at91x40_init_interrupts(unsigned int priority[NR_AIC_IRQS]) if (!priority) priority = at91x40_default_irq_priority; - at91_aic_init(priority); + at91_aic_init(priority, at91_extern_irq); }