From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Fri, 21 Dec 2007 08:31:25 +0000 (+0100)
Subject: [ARM] 4718/1: Fix redefinition warnings in PXA uncompressor code
X-Git-Tag: v2.6.25-rc1~1175^2^2~35
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a333aeb73b45d2b6bbaaebd56f9e7e3a674ac039;p=linux-2.6

[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>
---

diff --git a/include/asm-arm/arch-pxa/uncompress.h b/include/asm-arm/arch-pxa/uncompress.h
index 3faad53a68..dadf4c20b6 100644
--- a/include/asm-arm/arch-pxa/uncompress.h
+++ b/include/asm-arm/arch-pxa/uncompress.h
@@ -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