diff --git a/[refs] b/[refs]
index 19c4b5266195..678c595261b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 386ab6400a4d2331f60695cb355dcc3790ccfbcc
+refs/heads/master: 8338d87fea2c001b4f5a07f9217df89956d1fddd
diff --git a/trunk/arch/arm/mach-davinci/Makefile b/trunk/arch/arm/mach-davinci/Makefile
index 0b87a1ca2bb3..8f3c8ee43ffa 100644
--- a/trunk/arch/arm/mach-davinci/Makefile
+++ b/trunk/arch/arm/mach-davinci/Makefile
@@ -5,7 +5,7 @@
 
 # Common objects
 obj-y 			:= time.o clock.o serial.o io.o psc.o \
-			   gpio.o dma.o usb.o common.o sram.o aemif.o
+			   dma.o usb.o common.o sram.o aemif.o
 
 obj-$(CONFIG_DAVINCI_MUX)		+= mux.o
 
diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile
index 27295cbadaf3..a26fffacdfa5 100644
--- a/trunk/drivers/gpio/Makefile
+++ b/trunk/drivers/gpio/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_GPIO_ADP5588)	+= gpio-adp5588.o
 obj-$(CONFIG_GPIO_BT8XX)	+= gpio-bt8xx.o
 obj-$(CONFIG_GPIO_CS5535)	+= gpio-cs5535.o
 obj-$(CONFIG_GPIO_DA9052)	+= gpio-da9052.o
+obj-$(CONFIG_ARCH_DAVINCI)	+= gpio-davinci.o
 obj-$(CONFIG_GPIO_EP93XX)	+= gpio-ep93xx.o
 obj-$(CONFIG_GPIO_EXYNOS4)	+= gpio-exynos4.o
 obj-$(CONFIG_GPIO_IT8761E)	+= gpio-it8761e.o
diff --git a/trunk/arch/arm/mach-davinci/gpio.c b/trunk/drivers/gpio/gpio-davinci.c
similarity index 100%
rename from trunk/arch/arm/mach-davinci/gpio.c
rename to trunk/drivers/gpio/gpio-davinci.c