diff --git a/[refs] b/[refs]
index 611217aa6188..fcf819d2ff15 100644
--- 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
index 3aca5ba0f876..f302d048392d 100644
--- 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
index 84bc7389e367..19c5d27b6d2e 100644
--- 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 b/trunk/drivers/gpio/gpio-pxa.c
similarity index 100%
rename from trunk/arch/arm/plat-pxa/gpio.c
rename to trunk/drivers/gpio/gpio-pxa.c