From patchwork Thu Jun 20 14:24:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2757151 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A0174C0AB1 for ; Thu, 20 Jun 2013 16:27:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D971201CD for ; Thu, 20 Jun 2013 16:27:41 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3CBE22019E for ; Thu, 20 Jun 2013 16:27:40 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Upfp3-0007TO-JC; Thu, 20 Jun 2013 14:26:52 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Upfmx-0000Of-Mm; Thu, 20 Jun 2013 14:24:39 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Upfmv-0000Nh-Lu for linux-arm-kernel@lists.infradead.org; Thu, 20 Jun 2013 14:24:38 +0000 Received: from klappe2.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0M9cIl-1V0zvE2Uql-00DAdO; Thu, 20 Jun 2013 16:24:15 +0200 From: Arnd Bergmann To: Jamie Iles Subject: Re: [GIT PULL] picoxcell cleanups for 3.11 Date: Thu, 20 Jun 2013 16:24:09 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) References: <20130611122621.GA9967@page> <20130619100224.GB8641@page> In-Reply-To: <20130619100224.GB8641@page> MIME-Version: 1.0 Message-Id: <201306201624.09841.arnd@arndb.de> X-Provags-ID: V02:K0:1JcqfBCD4IUvmQ6ClOAQh1Uf18Xw1LrcQ8Zr0Ow6+5E H1cO/vlRR5L0jAiQTN1ZEoGd4O6bPYsyRsPa+IHLVtkm6VKNrT pDYLyPhFHqn7PA/K/E/br8Ii6olBkS2j9oZrD8hDCpF7Cac4Ch 4bFoKknxDnHhL6gUwO47qoUHOIr/yAhMjmoSEgoJaEtWSH1P2K 7jJEnOtf8NTdKirSmZXCJ2vpJjKub2f52r0qXxFp2ZMxFDjQdo 2RVufhLb+XPtOelbO8fMcVBSTQAloHcuH92+IXFnZ1vgNJo6YY 8j4mKJRf48ya5cqbT7+04N80j0FzJCa7VWbpb80WOjk/16g7kD RF4DlBiYIlLlWqdtsCtw= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130620_102438_006164_F3FB5AD2 X-CRM114-Status: UNSURE ( 9.78 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wednesday 19 June 2013, Jamie Iles wrote: > Fixing Arnd's mail address (sorry!). you did forget to fix up Olof's address though. > > ---------------------------------------------------------------- > > Jamie Iles (1): > > picoxcell: remove redundant common.h > > > > Maxime Ripard (1): > > ARM: picoxcell: Remove init_irq declaration in machine description I got a regression since NR_IRQS_LEGACY is not defined with the headers removed. I think we can just remove this line as well, since NR_IRQS_LEGACY is the default anyway. Does that work? diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c index 8267c5d..b13f51b 100644 --- a/arch/arm/mach-picoxcell/common.c +++ b/arch/arm/mach-picoxcell/common.c @@ -79,7 +79,6 @@ static void picoxcell_wdt_restart(char mode, const char *cmd) DT_MACHINE_START(PICOXCELL, "Picochip picoXcell") .map_io = picoxcell_map_io, - .nr_irqs = NR_IRQS_LEGACY, .init_machine = picoxcell_init_machine, .dt_compat = picoxcell_dt_match, .restart = picoxcell_wdt_restart,