From 88ce9b92418aa21c7dfed4d0f880243ababd2bd1 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 18 Sep 2006 10:19:06 +0100
Subject: [PATCH] --- yaml --- r: 36579 b: refs/heads/master c:
 50dedf168c1afd23cbc6c4fd8429c9e931b4e813 h: refs/heads/master i:   36577:
 ee3c5377f9f96eeed29cc9e9da49d65138c1bcbe   36575:
 f7c6a02360b2cddfefb501bd68ae8faf27a7bb24 v: v3

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

diff --git a/[refs] b/[refs]
index 410f09a72422..d4d151346a91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0033a2f0d028400ad04588efbd5740c73f0eb740
+refs/heads/master: 50dedf168c1afd23cbc6c4fd8429c9e931b4e813
diff --git a/trunk/arch/arm/mach-s3c2410/s3c2412.c b/trunk/arch/arm/mach-s3c2410/s3c2412.c
index 2d163f7600be..a5ec56efd5c5 100644
--- a/trunk/arch/arm/mach-s3c2410/s3c2412.c
+++ b/trunk/arch/arm/mach-s3c2410/s3c2412.c
@@ -56,6 +56,13 @@
 
 #ifndef CONFIG_CPU_S3C2412_ONLY
 void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;
+
+static inline void s3c2412_init_gpio2(void)
+{
+	s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10;
+}
+#else
+#define s3c2412_init_gpio2() do { } while(0)
 #endif
 
 /* Initial IO mappings */
@@ -110,7 +117,7 @@ void __init s3c2412_map_io(struct map_desc *mach_desc, int mach_size)
 {
 	/* move base of IO */
 
-	s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10;
+	s3c2412_init_gpio2();
 
 	/* set our idle function */