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 <a...@arndb.de> > Cc: Haojian Zhuang <haojian.zhu...@gmail.com> > Cc: Mike Rapoport <m...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
