Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754878Ab2JCGi7 (ORCPT ); Wed, 3 Oct 2012 02:38:59 -0400 Received: from softlayer.compulab.co.il ([50.23.254.55]:37805 "EHLO compulab.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753224Ab2JCGi5 (ORCPT ); Wed, 3 Oct 2012 02:38:57 -0400 Message-ID: <506BDD5E.9060302@compulab.co.il> Date: Wed, 03 Oct 2012 08:38:22 +0200 From: Igor Grinberg Organization: CompuLab Ltd. User-Agent: Mozilla/5.0 (X11; Linux i686; rv:10.0.5) Gecko/20120711 Thunderbird/10.0.5 MIME-Version: 1.0 To: Arnd Bergmann CC: linux-arm-kernel@infradead.org, arm@kernel.org, linux-kernel@vger.kernel.org, Haojian Zhuang , Mike Rapoport Subject: Re: [PATCH 06/17] ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM References: <1349195816-2225-1-git-send-email-arnd@arndb.de> <1349195816-2225-7-git-send-email-arnd@arndb.de> In-Reply-To: <1349195816-2225-7-git-send-email-arnd@arndb.de> X-Enigmail-Version: 1.3.5 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - softlayer.compulab.co.il X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1784 Lines: 51 On 10/02/12 18:36, Arnd Bergmann wrote: > 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. Yep, agreed... > > 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 Acked-by: Igor Grinberg Thanks for the patch. > --- > 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 -- Regards, Igor. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/