---

yaml --- r: 269425 b: refs/heads/master c: 354bf80 h: refs/heads/master i: 269423: 588e1f5 v: v3
git-mirror · Oct 1, 2011 · ca7dfa7 · ca7dfa7
1 parent 10569cb
commit ca7dfa7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd5f12a24766c1f299def0a78b008d4746f528f2
+refs/heads/master: 354bf8010ffea1ca5accd9fae26b7373df96bcb7
diff --git a/trunk/arch/arm/plat-pxa/Makefile b/trunk/arch/arm/plat-pxa/Makefile
@@ -4,7 +4,6 @@
 
 obj-y	:= dma.o
 
-obj-$(CONFIG_GENERIC_GPIO)	+= gpio.o
 obj-$(CONFIG_PXA3xx)		+= mfp.o
 obj-$(CONFIG_PXA95x)		+= mfp.o
 obj-$(CONFIG_ARCH_MMP)		+= mfp.o

diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_GPIO_PCA953X)	+= gpio-pca953x.o
 obj-$(CONFIG_GPIO_PCF857X)	+= gpio-pcf857x.o
 obj-$(CONFIG_GPIO_PCH)		+= gpio-pch.o
 obj-$(CONFIG_GPIO_PL061)	+= gpio-pl061.o
+obj-$(CONFIG_PLAT_PXA)		+= gpio-pxa.o
 obj-$(CONFIG_GPIO_RDC321X)	+= gpio-rdc321x.o
 
 obj-$(CONFIG_GPIO_PLAT_SAMSUNG)	+= gpio-plat-samsung.o

diff --git a/trunk/arch/arm/plat-pxa/gpio.c → trunk/drivers/gpio/gpio-pxa.c b/trunk/arch/arm/plat-pxa/gpio.c → trunk/drivers/gpio/gpio-pxa.c