From patchwork Wed Oct 3 19:02:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1543081 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 71B5FDFF71 for ; Wed, 3 Oct 2012 19:04:29 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TJUDS-0000Sz-QN; Wed, 03 Oct 2012 19:02:42 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TJUDK-0000SV-LH for linux-arm-kernel@lists.infradead.org; Wed, 03 Oct 2012 19:02:39 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Luphl-1TSWbK0qfZ-00zcAB; Wed, 03 Oct 2012 21:02:19 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: footbridge: remove RTC_IRQ definition Date: Wed, 3 Oct 2012 19:02:15 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201210031902.16200.arnd@arndb.de> X-Provags-ID: V02:K0:CGElv38qc04Mt+cj3dL0BedqC7R9aOHuX41J7uduMjI lk1hhSKtIzTLQaYejPe1YEvojOeU2s+dEYyimUAAVolZ6vfIR6 si2t2wqHlcpO9dS3OGYXYu4FiKvyN7+QrTU0fj+ftMuyMwtUf6 Djz5kqmADHhPfATvbwrrZ6MqYptGUvIYq5HNZkfRh32dbFWrCL 4sduTekaa3b0A+UGOIZWuElotPPG6ydO6v6wNATp/e5Q14yJBS 9Bc3TvS/AST1ub9JAlrfFg9LAGHKAzzK3a9b4zYFa5UmfFk1bD YewIsnqm5ntmPOLOIEPajcYk9EDLX7si1oLWAojlSQLXFSjs0W 8UEo7sYZPmUIu2EujlF0= 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: rtc-linux@googlegroups.com, Alessandro Zummo , Russell King , linux-kernel@vger.kernel.org, Rob Herring 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 Since commit bd8abc9a32c "ARM: mc146818rtc: remove unnecessary include of mach/irqs.h", building footbridge_defconfig results in this warning: In file included from include/linux/mc146818rtc.h:16:0, from arch/arm/mach-footbridge/isa-rtc.c:21: arch/arm/include/asm/mc146818rtc.h:10:0: warning: "RTC_IRQ" redefined [enabled by default] arch/arm/mach-footbridge/include/mach/irqs.h:93:0: note: this is the location of the previous definition The above commit was intentionally made to catch errors like this, where code relies on the RTC_IRQ definition. The only driver using it is the legacy PC-style drivers/char/rtc.c driver. However, the ARM architecture has been using the RTC_LIB framework since at least 2006, and that doesn't use it. Signed-off-by: Arnd Bergmann Cc: Rob Herring Cc: Alessandro Zummo Cc: rtc-linux@googlegroups.com Cc: Russell King --- I've queued this in late/fixes for the current merge window. Will send later unless someone objects. diff --git a/arch/arm/mach-footbridge/include/mach/irqs.h b/arch/arm/mach-footbridge/include/mach/irqs.h index 400551e..61c714c 100644 --- a/arch/arm/mach-footbridge/include/mach/irqs.h +++ b/arch/arm/mach-footbridge/include/mach/irqs.h @@ -89,8 +89,6 @@ #define IRQ_NETWINDER_VGA _ISA_IRQ(11) #define IRQ_NETWINDER_SOUND _ISA_IRQ(12) -#undef RTC_IRQ -#define RTC_IRQ IRQ_ISA_RTC_ALARM #define I8042_KBD_IRQ IRQ_ISA_KEYBOARD #define I8042_AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE) #define IRQ_FLOPPYDISK IRQ_ISA_FLOPPY