From 81b8e55bcd285daed6659c0cc028257bd4bf6264 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 24 May 2011 23:06:52 +0200 Subject: [PATCH] --- yaml --- r: 252573 b: refs/heads/master c: 06caa7ad8341db2f03165fa763559475cc404584 h: refs/heads/master i: 252571: c575294684d22ff71ac577fd05568b1e3e636743 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-u300/Makefile | 2 +- trunk/drivers/gpio/Makefile | 1 + trunk/{arch/arm/mach-u300/gpio.c => drivers/gpio/gpio-u300.c} | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename trunk/{arch/arm/mach-u300/gpio.c => drivers/gpio/gpio-u300.c} (100%) diff --git a/[refs] b/[refs] index 99cac9d0cc0c..3175e5d893ac 100644 --- 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 index fab46fe9a71f..8fd354aaf0a7 100644 --- 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 index d92ce3a62ae5..27a22086739b 100644 --- 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 b/trunk/drivers/gpio/gpio-u300.c similarity index 100% rename from trunk/arch/arm/mach-u300/gpio.c rename to trunk/drivers/gpio/gpio-u300.c