From 314dbc78f64d55bbaa966d477821b76e9a98314f Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Wed, 6 May 2009 10:14:04 +1000
Subject: [PATCH] --- yaml --- r: 162647 b: refs/heads/master c:
 a3d9bf1dfdaf6f7df6c5340521dff1aafe39393f h: refs/heads/master i:   162645:
 acf8ea271b9bb7fa5163d6e6e1835a65f0a847ad   162643:
 e1a81fe8d212a640887aef7bdff946f6694b3b6b   162639:
 f4828a8e333746662825ab7719bf22b03e2dfa8a v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/m68knommu/platform/520x/config.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 21b5e59223e7..f3e35ca0e9e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de4cbfb5994465e7c0f4cc545722b1144e8ba717
+refs/heads/master: a3d9bf1dfdaf6f7df6c5340521dff1aafe39393f
diff --git a/trunk/arch/m68knommu/platform/520x/config.c b/trunk/arch/m68knommu/platform/520x/config.c
index 6a1fd743817a..92614de42cd3 100644
--- a/trunk/arch/m68knommu/platform/520x/config.c
+++ b/trunk/arch/m68knommu/platform/520x/config.c
@@ -81,15 +81,11 @@ static struct platform_device *m520x_devices[] __initdata = {
 
 /***************************************************************************/
 
-#define	INTC0	(MCF_MBAR + MCFICM_INTC0)
-
 static void __init m520x_uart_init_line(int line, int irq)
 {
 	u16 par;
 	u8 par2;
 
-	writeb(0x03, INTC0 + MCFINTC_ICR0 + MCFINT_UART0 + line);
-
 	switch (line) {
 	case 0:
 		par = readw(MCF_IPSBAR + MCF_GPIO_PAR_UART);
@@ -128,11 +124,6 @@ static void __init m520x_fec_init(void)
 {
 	u8 v;
 
-	/* Unmask FEC interrupts at ColdFire interrupt controller */
-	writeb(0x4, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_ICR0 + 36);
-	writeb(0x4, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_ICR0 + 40);
-	writeb(0x4, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_ICR0 + 42);
-
 	/* Set multi-function pins to ethernet mode */
 	v = readb(MCF_IPSBAR + MCF_GPIO_PAR_FEC);
 	writeb(v | 0xf0, MCF_IPSBAR + MCF_GPIO_PAR_FEC);