From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752885AbbLIQwg (ORCPT ); Wed, 9 Dec 2015 11:52:36 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:64198 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752258AbbLIQwd (ORCPT ); Wed, 9 Dec 2015 11:52:33 -0500 From: Arnd Bergmann To: robert.jarzmik@free.fr Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Mack , Haojian Zhuang Subject: [PATCH] ARM: pxa: cm-x2xx: avoid duplicate macro warnings Date: Wed, 09 Dec 2015 17:52:06 +0100 Message-ID: <5126103.CuC5iMSqYG@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:DLTcsxu1ID2bvsRgWkOzfF1XXqzfA00bAkobl0l4TZR2zhrKsA2 8hmd0PhBRIxqDv8dkQzv2Bb5D3/Xg1PnA1lL09mWixSN8zmO59SMVcJgKRW4J91lfi/cNMf jxOQ5jptuUMgVEKKdT7Fldm0R9OQMDR7UsZ/Kyxm5ulHVwtna5GtXkQGSGlC2aP4M/yIztt VEWKpCNhqOFkGRwVhYkCg== X-UI-Out-Filterresults: notjunk:1;V01:K0:HhuonCczW6o=:PC3bd1QgOALgxPFrU5Ve4B zRgZ8uRRACWAd/93lRcVXVYRRI9bqrK1ps1jwnbcFLS7gdD4oklRFLOTzXz4LWV7oQ3WGjJd8 9jBeLQpJlMfZBxSLHCY0eaqXsOVV6HglKzmInE4pGN7X0CsxKuO22sEPCkeiLJSxgaBouKk/e m7T5Z5KGUb2dfSVWVt8NWR908QJzjPeG39NjZe++h6whsxs+DpoKI5peimP/LX6JJLwKe8LRk f7x9ahx4IHL+3kpLQJMtrOdgWNbseBKiQnJWkQGjb1am80HtsPN4DLqO5/99XKOyoWdBquoYM cLSPfBqkNmFS74NzU4rXMrDQn3c/JJjPwCkebvyihBFnJolaSkZqiPUcznodnNqf600xyzt7a umwgCD0oWjpPCFbGMKuSPmNylUm/LILIPTUXDpaZ0pbtTZc6sAAhjc4mp8KsILBYZsWdpczVB V5e0JtCHZdY7UrzJVfLxnQT/R8qdHuIcgLxXOxaATJ2jjYgCjb18iNsZM0+sfuWnQkI7XEZT6 0xS+rRa+qnIWdQjpHVCusWfW5coFzHJXl2POGac1na6tsJKKkUqkpOMU7S3LAtfrQJuAAIspe oqOMa27E+ecIh576KUPit9te0kusk5Aw00GJ7EzLAMoPVgeb6Nk9f/X7go7FX5RxRAFd4CIaX 2V62U9YWzL8jvgrleGrtywFbmDuh1j7fn8ufdMEVHPar3kUwF18LRCVqZzSwxdt556dWNFM7/ 3JeOQBcG/gyQKt46 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index f2d801160079..7202022ee243 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/arch/arm/mach-pxa/cm-x2xx.c @@ -24,7 +24,16 @@ #include "pxa25x.h" #undef GPIO24_SSP1_SFRM +#undef GPIO86_GPIO +#undef GPIO87_GPIO +#undef GPIO88_GPIO +#undef GPIO89_GPIO #include "pxa27x.h" +#undef GPIO24_SSP1_SFRM +#undef GPIO86_GPIO +#undef GPIO87_GPIO +#undef GPIO88_GPIO +#undef GPIO89_GPIO #include #include #include