diff --git a/[refs] b/[refs]
index cee192dec9fa..3ae9817b570e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9fe594344c3db554aebb48513b60bba90c4dd2d
+refs/heads/master: db23c7332b5391646c32585b06328da0463418f8
diff --git a/trunk/arch/arm/mach-ks8695/Makefile b/trunk/arch/arm/mach-ks8695/Makefile
index 7e3e8160ed30..853efd9133c6 100644
--- a/trunk/arch/arm/mach-ks8695/Makefile
+++ b/trunk/arch/arm/mach-ks8695/Makefile
@@ -3,7 +3,7 @@
 # Makefile for KS8695 architecture support
 #
 
-obj-y				:= cpu.o irq.o time.o gpio.o devices.o
+obj-y				:= cpu.o irq.o time.o devices.o
 obj-m				:=
 obj-n				:=
 obj-				:=
diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile
index 9588948c96f0..27295cbadaf3 100644
--- a/trunk/drivers/gpio/Makefile
+++ b/trunk/drivers/gpio/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_GPIO_EP93XX)	+= gpio-ep93xx.o
 obj-$(CONFIG_GPIO_EXYNOS4)	+= gpio-exynos4.o
 obj-$(CONFIG_GPIO_IT8761E)	+= gpio-it8761e.o
 obj-$(CONFIG_GPIO_JANZ_TTL)	+= gpio-janz-ttl.o
+obj-$(CONFIG_MACH_KS8695)	+= gpio-ks8695.o
 obj-$(CONFIG_GPIO_LANGWELL)	+= gpio-langwell.o
 obj-$(CONFIG_GPIO_MAX730X)	+= gpio-max730x.o
 obj-$(CONFIG_GPIO_MAX7300)	+= gpio-max7300.o
diff --git a/trunk/arch/arm/mach-ks8695/gpio.c b/trunk/drivers/gpio/gpio-ks8695.c
similarity index 100%
rename from trunk/arch/arm/mach-ks8695/gpio.c
rename to trunk/drivers/gpio/gpio-ks8695.c