diff --git a/[refs] b/[refs]
index b00c8b08a133..ae0a01b185f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67866fb38680d85cbd13c7bb468fb89f16e026d1
+refs/heads/master: 4f2b617aff8147338faa0d5ed7b57636076671bf
diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile
index ac12ba526f77..20cb335aa75b 100644
--- a/trunk/arch/arm/plat-s3c/Makefile
+++ b/trunk/arch/arm/plat-s3c/Makefile
@@ -13,7 +13,6 @@ obj-				:=
 
 obj-y				+= init.o
 obj-y				+= time.o
-obj-y				+= gpio.o
 
 # DMA support
 
diff --git a/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile
index 94fe6ea362be..27d5bfb60b2e 100644
--- a/trunk/arch/arm/plat-samsung/Makefile
+++ b/trunk/arch/arm/plat-samsung/Makefile
@@ -13,6 +13,7 @@ obj-				:=
 
 obj-y				+= clock.o
 obj-y				+= pwm-clock.o
+obj-y				+= gpio.o
 obj-y				+= gpio-config.o
 
 obj-$(CONFIG_SAMSUNG_GPIOLIB_4BIT)	+= gpiolib.o
diff --git a/trunk/arch/arm/plat-s3c/gpio.c b/trunk/arch/arm/plat-samsung/gpio.c
similarity index 100%
rename from trunk/arch/arm/plat-s3c/gpio.c
rename to trunk/arch/arm/plat-samsung/gpio.c