---

yaml --- r: 252573 b: refs/heads/master c: 06caa7a h: refs/heads/master i: 252571: c575294 v: v3
git-mirror · May 26, 2011 · 81b8e55 · 81b8e55
1 parent e7bc807
commit 81b8e55
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: 7812803a3119f7cf375bd04bc019ce2395a7c2fc
+refs/heads/master: 06caa7ad8341db2f03165fa763559475cc404584
diff --git a/trunk/arch/arm/mach-u300/Makefile b/trunk/arch/arm/mach-u300/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel, U300 machine.
 #
 
-obj-y		:= core.o clock.o timer.o gpio.o padmux.o
+obj-y		:= core.o clock.o timer.o padmux.o
 obj-m		:=
 obj-n		:=
 obj-		:=

diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_GPIO_WM831X)	+= wm831x-gpio.o
 obj-$(CONFIG_GPIO_WM8350)	+= wm8350-gpiolib.o
 obj-$(CONFIG_GPIO_WM8994)	+= wm8994-gpio.o
 obj-$(CONFIG_GPIO_SCH)		+= sch_gpio.o
+obj-$(CONFIG_MACH_U300)		+= gpio-u300.o
 obj-$(CONFIG_GPIO_RDC321X)	+= rdc321x-gpio.o
 obj-$(CONFIG_GPIO_JANZ_TTL)	+= janz-ttl.o
 obj-$(CONFIG_GPIO_SX150X)	+= sx150x.o

diff --git a/trunk/arch/arm/mach-u300/gpio.c → trunk/drivers/gpio/gpio-u300.c b/trunk/arch/arm/mach-u300/gpio.c → trunk/drivers/gpio/gpio-u300.c