From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752802AbbLIVAy (ORCPT ); Wed, 9 Dec 2015 16:00:54 -0500 Received: from smtp03.smtpout.orange.fr ([80.12.242.125]:53234 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751321AbbLIVAx (ORCPT ); Wed, 9 Dec 2015 16:00:53 -0500 X-ME-Helo: belgarion X-ME-Auth: amFyem1pay5yb2JlcnRAb3JhbmdlLmZy X-ME-Date: Wed, 09 Dec 2015 22:00:51 +0100 X-ME-IP: 92.156.1.80 From: Robert Jarzmik To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Mack , Haojian Zhuang Subject: Re: [PATCH] ARM: pxa: cm-x2xx: avoid duplicate macro warnings References: <5126103.CuC5iMSqYG@wuerfel> X-URL: http://belgarath.falguerolles.org/ Date: Wed, 09 Dec 2015 22:00:49 +0100 In-Reply-To: <5126103.CuC5iMSqYG@wuerfel> (Arnd Bergmann's message of "Wed, 09 Dec 2015 17:52:06 +0100") Message-ID: <87y4d3jq0u.fsf@belgarion.home> User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Arnd Bergmann writes: > In an old commit, we worked around the duplicate definition of > GPIO24_SSP1_SFRM in cm-x2xx.c, which includes files for both > pxa25x and pxa27x. Apparently the problem has come back and we > now have four additional duplicate symbols that cause warnings: > > In file included from /git/arm-soc/arch/arm/mach-pxa/pxa27x.h:7:0, > from /git/arm-soc/arch/arm/mach-pxa/cm-x2xx.c:27: > /git/arm-soc/arch/arm/mach-pxa/mfp-pxa27x.h:21:0: warning: "GPIO86_GPIO" redefined > #define GPIO86_GPIO MFP_CFG_IN(GPIO86, AF0) > > This uses the same hack as before and undefines all symbols that > are defined more than once. Fortunately, cm-x2xx does not need > any of these. > > Signed-off-by: Arnd Bergmann Digging out old patches of 2012, cool. Acked-by: Robert Jarzmik I suppose it's a necessary hack until I manage to kill the mfp interface in favor of pinctrl. Cheers. -- Robert