Skip to content

Commit

Permalink
[ARM] 4718/1: Fix redefinition warnings in PXA uncompressor code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Philipp Zabel authored and Russell King committed Jan 26, 2008
1 parent 9a788c6 commit a333aeb
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions include/asm-arm/arch-pxa/uncompress.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit a333aeb

Please sign in to comment.