[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: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
9a788c6b78
commit
a333aeb73b
|
@ -12,10 +12,7 @@
|
||||||
#include <linux/serial_reg.h>
|
#include <linux/serial_reg.h>
|
||||||
#include <asm/arch/pxa-regs.h>
|
#include <asm/arch/pxa-regs.h>
|
||||||
|
|
||||||
#define FFUART ((volatile unsigned long *)0x40100000)
|
#define __REG(x) ((volatile unsigned long *)x)
|
||||||
#define BTUART ((volatile unsigned long *)0x40200000)
|
|
||||||
#define STUART ((volatile unsigned long *)0x40700000)
|
|
||||||
#define HWUART ((volatile unsigned long *)0x41600000)
|
|
||||||
|
|
||||||
#define UART FFUART
|
#define UART FFUART
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue