From 7e5e440ea8d50d55459d8fd5e5971a64e4593212 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 19 May 2009 15:00:01 +1000
Subject: [PATCH] --- yaml --- r: 162656 b: refs/heads/master c:
 f6a66276f5fdc018d2a9378c71de3bae13c588d7 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/m68k/include/asm/m532xsim.h      |  5 +++++
 trunk/arch/m68knommu/platform/532x/config.c | 17 +----------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 47d24938d2b1..d9131bfdc80d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04b75b10dceadf937e3707ecc3dfccf6a076fd29
+refs/heads/master: f6a66276f5fdc018d2a9378c71de3bae13c588d7
diff --git a/trunk/arch/m68k/include/asm/m532xsim.h b/trunk/arch/m68k/include/asm/m532xsim.h
index 021a0e155270..36bf15aec9ae 100644
--- a/trunk/arch/m68k/include/asm/m532xsim.h
+++ b/trunk/arch/m68k/include/asm/m532xsim.h
@@ -66,6 +66,11 @@
 #define MCFSIM_ICR_TIMER1	(0xFC048040+32)
 #define MCFSIM_ICR_TIMER2	(0xFC048040+33)
 
+/*
+ *	Define system peripheral IRQ usage.
+ */
+#define	MCF_IRQ_TIMER		(64 + 32)	/* Timer0 */
+#define	MCF_IRQ_PROFILER	(64 + 33)	/* Timer1 */
 
 /*
  *	Define the Cache register flags.
diff --git a/trunk/arch/m68knommu/platform/532x/config.c b/trunk/arch/m68knommu/platform/532x/config.c
index 66e212b58b85..d632948e64e5 100644
--- a/trunk/arch/m68knommu/platform/532x/config.c
+++ b/trunk/arch/m68knommu/platform/532x/config.c
@@ -30,12 +30,6 @@
 
 /***************************************************************************/
 
-extern unsigned int mcf_timervector;
-extern unsigned int mcf_profilevector;
-extern unsigned int mcf_timerlevel;
-
-/***************************************************************************/
-
 static struct mcf_platform_uart m532x_uart_platform[] = {
 	{
 		.mapbase	= MCFUART_BASE1,
@@ -87,6 +81,7 @@ static struct platform_device m532x_fec = {
 	.num_resources		= ARRAY_SIZE(m532x_fec_resources),
 	.resource		= m532x_fec_resources,
 };
+
 static struct platform_device *m532x_devices[] __initdata = {
 	&m532x_uart,
 	&m532x_fec,
@@ -126,12 +121,6 @@ static void __init m532x_fec_init(void)
 
 /***************************************************************************/
 
-void mcf_settimericr(unsigned int timer, unsigned int level)
-{
-}
-
-/***************************************************************************/
-
 static void m532x_cpu_reset(void)
 {
 	local_irq_disable();
@@ -153,10 +142,6 @@ void __init config_BSP(char *commandp, int size)
 	}
 #endif
 
-	mcf_timervector = 64+32;
-	mcf_profilevector = 64+33;
-	mach_reset = m532x_cpu_reset;
-
 #ifdef CONFIG_BDM_DISABLE
 	/*
 	 * Disable the BDM clocking.  This also turns off most of the rest of