From: Igor Grinberg <grinberg@compulab.co.il>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@infradead.org, arm@kernel.org,
linux-kernel@vger.kernel.org,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Mike Rapoport <mike@compulab.co.il>
Subject: Re: [PATCH 06/17] ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM
Date: Wed, 03 Oct 2012 08:38:22 +0200 [thread overview]
Message-ID: <506BDD5E.9060302@compulab.co.il> (raw)
In-Reply-To: <1349195816-2225-7-git-send-email-arnd@arndb.de>
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 <arnd@arndb.de>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Mike Rapoport <mike@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
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 <asm/mach/map.h>
>
> #include <mach/pxa25x.h>
> +#undef GPIO24_SSP1_SFRM
> #include <mach/pxa27x.h>
> #include <mach/audio.h>
> #include <mach/pxafb.h>
--
Regards,
Igor.
next prev parent reply other threads:[~2012-10-03 6:38 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1349195816-2225-1-git-send-email-arnd@arndb.de>
2012-10-02 16:36 ` [PATCH 01/17] ARM: shmobile: fix memory size for kota2_defconfig Arnd Bergmann
2012-10-03 0:37 ` Simon Horman
2012-10-04 8:34 ` Arnd Bergmann
2012-10-04 8:58 ` Simon Horman
2012-11-30 22:10 ` Olof Johansson
2012-12-01 0:26 ` Simon Horman
2013-01-07 1:59 ` Simon Horman
2013-01-07 13:33 ` Arnd Bergmann
2013-01-08 0:19 ` Simon Horman
2013-01-08 19:06 ` Arnd Bergmann
2012-10-02 16:36 ` [PATCH 02/17] ARM: shark: fix shark_pci_init return code Arnd Bergmann
2012-10-02 16:36 ` [PATCH 03/17] ARM: pxa: Wunused-result warning in viper board file Arnd Bergmann
2012-10-02 16:50 ` Marc Zyngier
2012-10-02 16:36 ` [PATCH 04/17] ARM: pxa: define palmte2_pxa_keys conditionally Arnd Bergmann
2012-10-03 11:23 ` Marek Vasut
2012-10-02 16:36 ` [PATCH 05/17] ARM: pxa: remove sharpsl_fatal_check function Arnd Bergmann
2012-10-08 2:38 ` Eric Miao
2012-10-08 3:19 ` Haojian Zhuang
2012-10-02 16:36 ` [PATCH 06/17] ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM Arnd Bergmann
2012-10-03 6:38 ` Igor Grinberg [this message]
2012-10-02 16:36 ` [PATCH 07/17] ARM: at91: skip at91_io_desc definition for NOMMU Arnd Bergmann
2012-10-02 18:56 ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-04 8:23 ` Arnd Bergmann
2012-10-02 16:36 ` [PATCH 08/17] ARM: at91: unused variable in at91_pm_verify_clocks Arnd Bergmann
2012-10-02 18:55 ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-04 8:28 ` Arnd Bergmann
2012-10-04 13:05 ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-02 16:36 ` [PATCH 09/17] ARM: imx: select ARM_CPU_SUSPEND if necessary Arnd Bergmann
2012-10-07 4:12 ` Shawn Guo
2012-10-07 8:33 ` Arnd Bergmann
2012-10-02 16:36 ` [PATCH 10/17] ARM: s3c24xx: fix multiple section mismatch warnings Arnd Bergmann
2012-10-02 16:36 ` [PATCH 11/17] ARM: mv78xx0: mark mv78xx0_timer_init as __init_refok Arnd Bergmann
2012-10-02 16:36 ` [PATCH 12/17] ARM: iop13xx: mark iop13xx_scan_bus as __devinit Arnd Bergmann
2012-10-02 20:08 ` Bjorn Helgaas
2012-10-04 10:32 ` Arnd Bergmann
2012-10-04 14:30 ` Greg KH
2012-10-02 16:36 ` [PATCH 13/17] ARM: iop13xx: fix iq81340sc_atux_map_irq prototype Arnd Bergmann
2012-10-02 16:36 ` [PATCH 14/17] ARM: davinci: don't mark da850_register_cpufreq as __init Arnd Bergmann
2012-10-04 13:18 ` Sekhar Nori
2012-10-02 16:36 ` [PATCH 15/17] ARM: rpc: check device_register return code in ecard_probe Arnd Bergmann
2012-10-02 16:36 ` [PATCH 16/17] ARM: ks8695: __arch_virt_to_dma type handling Arnd Bergmann
2012-10-02 16:36 ` [PATCH 17/17] ARM: soc: dependency warnings for errata Arnd Bergmann
2012-10-02 17:16 ` Stephen Warren
2012-10-03 11:23 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=506BDD5E.9060302@compulab.co.il \
--to=grinberg@compulab.co.il \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mike@compulab.co.il \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome