diff --git a/[refs] b/[refs]
index d6a43a65d0f9..3dc9c3a717b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a801cd619215a9e8c4968352cf8698ea5235f0f4
+refs/heads/master: 94df868b884d673c294e39a11acdfebf2bfcd67b
diff --git a/trunk/arch/arm/mach-s3c6400/include/mach/map.h b/trunk/arch/arm/mach-s3c6400/include/mach/map.h
index 83ed3c158693..618f09d637b2 100644
--- a/trunk/arch/arm/mach-s3c6400/include/mach/map.h
+++ b/trunk/arch/arm/mach-s3c6400/include/mach/map.h
@@ -35,6 +35,10 @@
 #define S3C64XX_PA_SYSCON	(0x7E00F000)
 #define S3C64XX_PA_TIMER	(0x7F006000)
 
+#define S3C64XX_PA_GPIO		(0x7F008000)
+#define S3C64XX_VA_GPIO		S3C_ADDR(0x00500000)
+#define S3C64XX_SZ_GPIO		SZ_4K
+
 #define S3C64XX_PA_SDRAM	(0x50000000)
 #define S3C64XX_PA_VIC0		(0x71200000)
 #define S3C64XX_PA_VIC1		(0x71300000)
diff --git a/trunk/arch/arm/plat-s3c64xx/cpu.c b/trunk/arch/arm/plat-s3c64xx/cpu.c
index 2559d6afc317..0bbc0e2dc5d4 100644
--- a/trunk/arch/arm/plat-s3c64xx/cpu.c
+++ b/trunk/arch/arm/plat-s3c64xx/cpu.c
@@ -92,6 +92,11 @@ static struct map_desc s3c_iodesc[] __initdata = {
 		.pfn		= __phys_to_pfn(S3C_PA_TIMER),
 		.length		= SZ_16K,
 		.type		= MT_DEVICE,
+	}, {
+		.virtual	= S3C64XX_VA_GPIO,
+		.pfn		= __phys_to_pfn(S3C64XX_PA_GPIO),
+		.length		= SZ_4K,
+		.type		= MT_DEVICE,
 	},
 };