From patchwork Tue Oct 2 16:36:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11952 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8B29A2414D for ; Tue, 2 Oct 2012 16:37:18 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 42A12A18710 for ; Tue, 2 Oct 2012 16:37:18 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so14608949iej.11 for ; Tue, 02 Oct 2012 09:37:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=VPb1nvPEV653oOtCJrAEJULkZAKEarT9BeiuXIM2jD0=; b=W+mDft6HqqxkIOuWsFekSn/AK3diUokXdsJnCetpl5VdBWwoHLxN4jLZOxLMYG1/MC 0J3nzEApMAqSPsImOzR7gSZOYENMOwmkrW7QswMV7mOwRci2wTe2Ft4fa6QEL3IgJFkU miBgmYDTL/Jv0ZWg9klGn5ZJKKhFSX1araXF7NyNLSwGel2gb429WBybcsdXe+7CM9kC EdxNctUcUame65F7OBYCYnAInG9qU7HiVntUpt1djXGMx4J9yvaKdLP8cLoWsS6QyAI9 wOrgDd1gTqMCzbTMspCZ0JsKePE8KSBzTx4z60rj1mYCZCv43eeeJ1xW40ranPccBTT/ Gzzg== Received: by 10.50.154.227 with SMTP id vr3mr9383332igb.43.1349195837965; Tue, 02 Oct 2012 09:37:17 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp92048igc; Tue, 2 Oct 2012 09:37:16 -0700 (PDT) Received: by 10.180.102.131 with SMTP id fo3mr6338089wib.1.1349195836452; Tue, 02 Oct 2012 09:37:16 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.187]) by mx.google.com with ESMTPS id bf4si999921wib.1.2012.10.02.09.37.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 09:37:16 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.187; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MBqAp-1TAbXj1wU3-00AcdU; Tue, 02 Oct 2012 18:37:12 +0200 From: Arnd Bergmann To: linux-arm-kernel@infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Haojian Zhuang , Mike Rapoport Subject: [PATCH 06/17] ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM Date: Tue, 2 Oct 2012 18:36:45 +0200 Message-Id: <1349195816-2225-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349195816-2225-1-git-send-email-arnd@arndb.de> References: <1349195816-2225-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:KT0mO/nDxTFBQYV/ia7fYlWiYtMlb3ONz6bX+6wRQzM h72RDfUOlmYpEI1TVSa6HDIJnwc0rXqKfaAnqnWhscxz00S91T 9atFq4qABBMKivgad7vO60fYZE5/NpQagCFJNjLROnOuarHdZl /fTutAGL8ILqSjKFit3haVkuSG/1hg0iVAo8Z3yfB6u2AYeQHe emeSfe085wo4G7W32kTzwFDn2schTWV60vYnSmtopMLjY+DhxR TlexYWZYPYCwCvfMJsXIQQDiI6LeR2d+c7H8XBQ6XeFvo6JPnV dkIiuBARrXbTkLmJbjnkzKS+kmmbykYr1Ttiwpg3gPncfuXjLS OzVnUpq+sLxQJB4hdZadvFWRSA1BYWFA6Op6Xk2b57g2eIBrBt CvJQC3A/wyY/Q== X-Gm-Message-State: ALoCoQnuCvKLjtPtH4UWNYkzSEHUMdjdcuUhJDvAIJ06fZYkG3SMkRp477NjyQ3QMf1jDZhYUocJ The symbol "GPIO24_SSP1_SFRM" is defined in both mfp-pxa27x.h and mfp-pxa25x.h. Since the macro is not actually used in the cm-x2xx.c file, but it includes both headers, a safe workaround should be to just undefine it from the .c file. This is a bit hacky and the headers should be fixed to not both define it, but for now it gets us around an annoying warning. Without this patch, building cm_x2xx_defconfig results in: In file included from arch/arm/mach-pxa/include/mach-pxa/pxa27x.h:7:0, from arch/arm/mach-pxa/cm-x2xx.c:25: arch/arm/mach-pxa/include/mach-pxa/mfp-pxa27x.h:215:0: warning: "GPIO24_SSP1_SFRM" redefined [enabled by default] arch/arm/mach-pxa/include/mach-pxa/mfp-pxa25x.h:111:0: note: this is the location of the previous definition Signed-off-by: Arnd Bergmann Cc: Haojian Zhuang Cc: Mike Rapoport --- arch/arm/mach-pxa/cm-x2xx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index 8fa4ad2..ae5e74a 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/arch/arm/mach-pxa/cm-x2xx.c @@ -22,6 +22,7 @@ #include #include +#undef GPIO24_SSP1_SFRM #include #include #include