diff --git a/[refs] b/[refs]
index af3d174d97ed..ad82fb018f91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c587c05d715ca8461342c2cb3b4a67036b5c22b
+refs/heads/master: 2428835fc6a579b68dde16d37e0b72ca29259c96
diff --git a/trunk/arch/arm/mach-sa1100/Makefile b/trunk/arch/arm/mach-sa1100/Makefile
index 41252d22e659..73a5c6431792 100644
--- a/trunk/arch/arm/mach-sa1100/Makefile
+++ b/trunk/arch/arm/mach-sa1100/Makefile
@@ -3,7 +3,7 @@
 #
 
 # Common support
-obj-y := clock.o generic.o gpio.o irq.o dma.o time.o #nmi-oopser.o
+obj-y := clock.o generic.o irq.o dma.o time.o #nmi-oopser.o
 obj-m :=
 obj-n :=
 obj-  :=
diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile
index 33e095bdb65c..84bc7389e367 100644
--- a/trunk/drivers/gpio/Makefile
+++ b/trunk/drivers/gpio/Makefile
@@ -45,7 +45,7 @@ obj-$(CONFIG_GPIO_RDC321X)	+= gpio-rdc321x.o
 obj-$(CONFIG_GPIO_PLAT_SAMSUNG)	+= gpio-plat-samsung.o
 obj-$(CONFIG_GPIO_S5PC100)	+= gpio-s5pc100.o
 obj-$(CONFIG_GPIO_S5PV210)	+= gpio-s5pv210.o
-
+obj-$(CONFIG_ARCH_SA1100)	+= gpio-sa1100.o
 obj-$(CONFIG_GPIO_SCH)		+= gpio-sch.o
 obj-$(CONFIG_GPIO_STMPE)	+= gpio-stmpe.o
 obj-$(CONFIG_GPIO_SX150X)	+= gpio-sx150x.o
diff --git a/trunk/arch/arm/mach-sa1100/gpio.c b/trunk/drivers/gpio/gpio-sa1100.c
similarity index 98%
rename from trunk/arch/arm/mach-sa1100/gpio.c
rename to trunk/drivers/gpio/gpio-sa1100.c
index e547ed41ec6b..b6c1f6d80649 100644
--- a/trunk/arch/arm/mach-sa1100/gpio.c
+++ b/trunk/drivers/gpio/gpio-sa1100.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 
 #include <mach/hardware.h>
-#include "generic.h"
 
 static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset)
 {