Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a333aeb7 authored by Philipp Zabel's avatar Philipp Zabel Committed by Russell King
Browse files

[ARM] 4718/1: Fix redefinition warnings in PXA uncompressor code 



FFUART and friends are already defined as __REG(x) in pxa-regs.h.
Instead of redefining them here, we can just provide the __REG macro.
Including asm/arch/hardware.h is not an option because this physical
addresses are needed here.
This is a fix for the compiler warnings generated by 4663/1.

Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Acked-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9a788c6b

include/asm-arm/arch-pxa/uncompress.h

+1 −4
Original line number Diff line number Diff line
@@ -12,10 +12,7 @@ 
#include <linux/serial_reg.h>

#include <asm/arch/pxa-regs.h>



#define FFUART		((volatile unsigned long *)0x40100000)

#define BTUART		((volatile unsigned long *)0x40200000)

#define STUART		((volatile unsigned long *)0x40700000)

#define HWUART		((volatile unsigned long *)0x41600000)

#define __REG(x)	((volatile unsigned long *)x)



#define UART		FFUART