From 98526b8c36290f8c6bbc460ed97eb38c920a8d97 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Sun, 11 Feb 2007 18:56:03 +0100
Subject: [PATCH] --- yaml --- r: 48927 b: refs/heads/master c:
 1b8fc1880cf36bd1f3df932601a6745bb164acc4 h: refs/heads/master i:   48925:
 7c3bd0d0772f8aeb4f7e86d54d7f2fa0e79b32b1   48923:
 63fe0d35c41e5ef9dab1b5e82f55f9a04bf2a4fa   48919:
 019f07383d54a6b7631b013122789e4603ff1e00   48911:
 a78b2ec9f982eafdd096e748ae3f4f7a16e57356   48895:
 ce2f884714ee75ead000789fcfd2b650fd222cff v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/mach-s3c2410/mach-amlm5900.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index bddfb1f6e603..54f7b8f96887 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a21765a70ec06be175d3997320a83fa66fcc8955
+refs/heads/master: 1b8fc1880cf36bd1f3df932601a6745bb164acc4
diff --git a/trunk/arch/arm/mach-s3c2410/mach-amlm5900.c b/trunk/arch/arm/mach-s3c2410/mach-amlm5900.c
index d54cda1b3006..72f2cc4fcd03 100644
--- a/trunk/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/trunk/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -35,7 +35,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/proc_fs.h>
-
+#include <linux/serial_core.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -113,12 +113,6 @@ static struct platform_device amlm5900_device_nor = {
 #endif
 
 static struct map_desc amlm5900_iodesc[] __initdata = {
-	{
-		.virtual	= (u32)S3C24XX_VA_SPI,
-		.pfn		= __phys_to_pfn(S3C2410_PA_SPI),
-		.length		= SZ_1M,
-		.type		= MT_DEVICE
-	}
 };
 
 #define UCON S3C2410_UCON_DEFAULT