From 7252a44ec78de2a8068d84889863d1cd9ee7210b Mon Sep 17 00:00:00 2001
From: Matt Waddel <Matt.Waddel@freescale.com>
Date: Sat, 20 Dec 2008 07:16:38 -0700
Subject: [PATCH] --- yaml --- r: 130351 b: refs/heads/master c:
 add8240eedb586b9d885c324db7f98fc1a470f9f h: refs/heads/master i:   130349:
 b640f6829f2a20fac107b6fc3a5546ef061144f7   130347:
 e77cd95a00272d6e9f9e83d7d761e01738e61967   130343:
 aba6783525f7fd9b51ca4b23cda312b36187cb73   130335:
 968d61d12dcebf89ce65ce7e99998610160eb0c6 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/m68knommu/platform/532x/config.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 72a86a0522d6..9eea1c7cf988 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05ae6fa31874eda2484da13c5dc4ddee8a47a0a4
+refs/heads/master: add8240eedb586b9d885c324db7f98fc1a470f9f
diff --git a/trunk/arch/m68knommu/platform/532x/config.c b/trunk/arch/m68knommu/platform/532x/config.c
index 4f44b632045b..a347623d6ee6 100644
--- a/trunk/arch/m68knommu/platform/532x/config.c
+++ b/trunk/arch/m68knommu/platform/532x/config.c
@@ -41,15 +41,15 @@ extern unsigned int mcf_timerlevel;
 
 static struct mcf_platform_uart m532x_uart_platform[] = {
 	{
-		.mapbase	= MCF_MBAR + MCFUART_BASE1,
+		.mapbase	= MCFUART_BASE1,
 		.irq		= MCFINT_VECBASE + MCFINT_UART0,
 	},
 	{
-		.mapbase 	= MCF_MBAR + MCFUART_BASE2,
+		.mapbase 	= MCFUART_BASE2,
 		.irq		= MCFINT_VECBASE + MCFINT_UART1,
 	},
 	{
-		.mapbase 	= MCF_MBAR + MCFUART_BASE3,
+		.mapbase 	= MCFUART_BASE3,
 		.irq		= MCFINT_VECBASE + MCFINT_UART2,
 	},
 	{ },
@@ -108,7 +108,7 @@ void mcf_settimericr(unsigned int timer, unsigned int level)
 		default: irq = 32; icr = MCFSIM_ICR_TIMER1; break;
 		}
 		
-		icrp = (volatile unsigned char *) (MCF_MBAR + icr);
+		icrp = (volatile unsigned char *) (icr);
 		*icrp = level;
 		mcf_enable_irq0(irq);
 	}