Message ID | 1382627074-23228-1-git-send-email-linus.walleij@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3E11D9F2B7 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 24 Oct 2013 15:05:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8DD0620278 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 24 Oct 2013 15:05:23 +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 947EF20260 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 24 Oct 2013 15:05:18 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VZMTL-0006S0-J4; Thu, 24 Oct 2013 15:05:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VZMTJ-0003Cw-5n; Thu, 24 Oct 2013 15:05:13 +0000 Received: from mail-wg0-f48.google.com ([74.125.82.48]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VZMTF-0003CW-92 for linux-arm-kernel@lists.infradead.org; Thu, 24 Oct 2013 15:05:09 +0000 Received: by mail-wg0-f48.google.com with SMTP id b13so2468723wgh.15 for <linux-arm-kernel@lists.infradead.org>; Thu, 24 Oct 2013 08:04:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=wV/1mnY0XfAR/FPWC2DJT1Ntbsc5A0JuHboA+8o7yM8=; b=QCgn8dCwC6Swc9JCJRrYYa+DLxMqof3ovl7G0NhU2H2z8h/lXIIZLrQ+UxeM0RujoG a9gCKu5ThbfC2gNAn+w+bzajIiyMWvalEwrVZaMGCIc5pI6c6CxcB3ic6aBvoNz+EsRH beRNX9gQqf85QzGYSedvRQdsMK+zmS7d8QWLAMJJVj7FM0rsUoqJbU9u4YMLxWMRPXV4 FGhlLYBdW27s2o+1BlSY9bbiDzmp7IvI9U3gVfRV/vR5hHkMkEaPC8npQjdcWswKn5qA gqYqodNSp1e1fKqBEaYkjJMLdV9RkCwr0xoF7Pxwq+EFdB8CFaDfZOYYAujbIngoj0az edAQ== X-Gm-Message-State: ALoCoQlmNsml2KFEvpVSLyyTtiU5+IwsT1xGZXF5gHvKlyJ84+OPCak74OYJHgsggwomC92VfZY0 X-Received: by 10.180.73.113 with SMTP id k17mr2698739wiv.6.1382627086564; Thu, 24 Oct 2013 08:04:46 -0700 (PDT) Received: from localhost.localdomain.quadriga.com (ip-77-221-165-98.dsl.twang.net. [77.221.165.98]) by mx.google.com with ESMTPSA id e1sm27841575wij.6.2013.10.24.08.04.44 for <multiple recipients> (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2013 08:04:45 -0700 (PDT) From: Linus Walleij <linus.walleij@linaro.org> To: linux-gpio@vger.kernel.org, Russell King <linux@arm.linux.org.uk>, Olof Johansson <olof@lixom.net> Subject: [PATCH] ARM: sa1100: fix simpad compilation warning Date: Thu, 24 Oct 2013 17:04:34 +0200 Message-Id: <1382627074-23228-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131024_110509_433277_C191C8ED X-CRM114-Status: GOOD ( 10.93 ) X-Spam-Score: -2.6 (--) Cc: Kevin Hilman <khilman@linaro.org>, Linus Walleij <linus.walleij@linaro.org>, Kristoffer Ericson <kristoffer.ericson@gmail.com>, Alexandre Courbot <acourbot@nvidia.com>, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 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 |
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index bcbc94540e45..41e476e571d7 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c @@ -19,6 +19,7 @@ #include <mach/hardware.h> #include <asm/setup.h> +#include <asm/irq.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
When removing the complex GPIO interface from the SA1100 machines, we also removed the implicit #includes for a few header files that was included by <linux/gpio.h> thru <mach/gpio.h>, causing a compile warning on the simpad boardfile, as <asm/irq.h> was no longer #included, as follows: ./../arch/arm/include/asm/irq.h:9:0: warning: "NR_IRQS" redefined [enabled by default] #define NR_IRQS NR_IRQS_LEGACY ^ In file included from ../../arch/arm/mach-sa1100/simpad.c:29:0: ../../arch/arm/mach-sa1100/include/mach/irqs.h:87:0: note: this is the location of the previous definition #define NR_IRQS (IRQ_BOARD_START + NR_IRQS_LOCOMO) This resolves the problem by explicitly including <asm/irq.h> into the simpad boardfile. Reported-by: Olof Johansson <olof@lixom.net> Cc: Russell King <linux@arm.linux.org.uk> Cc: Alexandre Courbot <acourbot@nvidia.com> Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com> Cc: Kevin Hilman <khilman@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- arch/arm/mach-sa1100/simpad.c | 1 + 1 file changed, 1 insertion(+)