mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
ARM: pxa: cm-x2xx: avoid duplicate macro warnings
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 <arnd@arndb.de> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
This commit is contained in:
parent
8864eaca90
commit
f39c42f5f9
1 changed files with 9 additions and 0 deletions
|
@ -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 <mach/audio.h>
|
||||
#include <linux/platform_data/video-pxafb.h>
|
||||
#include <mach/smemc.h>
|
||||
|
|
Loading…
Reference in a new issue