From patchwork Thu Oct 24 15:04:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21249 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 599E425E5F for ; Thu, 24 Oct 2013 15:04:49 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id uo5sf306393pbc.10 for ; Thu, 24 Oct 2013 08:04:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=wV/1mnY0XfAR/FPWC2DJT1Ntbsc5A0JuHboA+8o7yM8=; b=mHDfoSpdEIr/vBZLUVgP6hO+QH8eNp4g49h6rKeqqHfC9L/YAgGGwHWa5SkHjKKOiV LOzjIDPD5kP4Kl2/g0OChjlx176t7zD13UOtUjI6VmClFJdZbF54pthE+gNQO14RHRua tqlw0lwItmd/Bgpr9AGwiO89+tdAQ2F+AUNZWNtIaodykFdLfsotdxGU0jMLAeTsIDpe wUwpFGW7rSNx3rHUYv/fwrf8i5IWwl9yGJ5z98BkOOUGJBjl3xb43aL0o9WLwRRnhj2g YyV/oJoX5FOMqXkUGi/dVjg6+CGOUMTkrcvr6iy+9RWdvXiV7gNB17b7vHXLWApkwrpx BZjQ== X-Received: by 10.66.252.170 with SMTP id zt10mr1291622pac.34.1382627088306; Thu, 24 Oct 2013 08:04:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.194 with SMTP id k2ls867336qej.45.gmail; Thu, 24 Oct 2013 08:04:48 -0700 (PDT) X-Received: by 10.58.136.231 with SMTP id qd7mr1606857veb.1.1382627088166; Thu, 24 Oct 2013 08:04:48 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id gs5si384863vdc.117.2013.10.24.08.04.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Oct 2013 08:04:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hu8so1391315vcb.14 for ; Thu, 24 Oct 2013 08:04:48 -0700 (PDT) X-Gm-Message-State: ALoCoQkWbxkYEja1q5+W0uLnU3aR7EviVTHzGklF4C/3wOjwPGApGcmWEHxFlGYj2+6G6a3ApQPq X-Received: by 10.58.255.71 with SMTP id ao7mr1635757ved.16.1382627088045; Thu, 24 Oct 2013 08:04:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp397828vcz; Thu, 24 Oct 2013 08:04:47 -0700 (PDT) X-Received: by 10.194.250.6 with SMTP id yy6mr3062188wjc.13.1382627087120; Thu, 24 Oct 2013 08:04:47 -0700 (PDT) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by mx.google.com with ESMTPS id kx10si991767wjb.51.2013.10.24.08.04.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Oct 2013 08:04:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.181 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.212.181; Received: by mail-wi0-f181.google.com with SMTP id l12so2709071wiv.8 for ; Thu, 24 Oct 2013 08:04:46 -0700 (PDT) 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 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2013 08:04:45 -0700 (PDT) From: Linus Walleij To: linux-gpio@vger.kernel.org, Russell King , Olof Johansson Cc: Alexandre Courbot , linux-arm-kernel@lists.infradead.org, Linus Walleij , Kristoffer Ericson , Kevin Hilman 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 thru , causing a compile warning on the simpad boardfile, as 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 into the simpad boardfile. Reported-by: Olof Johansson Cc: Russell King Cc: Alexandre Courbot Cc: Kristoffer Ericson Cc: Kevin Hilman Signed-off-by: Linus Walleij --- arch/arm/mach-sa1100/simpad.c | 1 + 1 file changed, 1 insertion(+) 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 #include +#include #include #include