---

yaml --- r: 269404 b: refs/heads/master c: 8338d87 h: refs/heads/master v: v3
git-mirror · Aug 22, 2011 · 4dc9ab6 · 4dc9ab6
1 parent a7c52a6
commit 4dc9ab6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 → trunk/drivers/gpio/gpio-davinci.c b/trunk/arch/arm/mach-davinci/gpio.c → trunk/drivers/gpio/gpio-davinci.c