Commit:     a333aeb73b45d2b6bbaaebd56f9e7e3a674ac039
Parent:     9a788c6b78802b4a378be3f0d4c2da30da811620
Author:     Philipp Zabel <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 21 09:31:25 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sat Jan 26 15:07:52 2008 +0000

    [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 <[EMAIL PROTECTED]>
    Acked-by: Nicolas Pitre <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
 include/asm-arm/arch-pxa/uncompress.h |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/include/asm-arm/arch-pxa/uncompress.h 
index 3faad53..dadf4c2 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
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to