From 69f82877043c5b02677ae3eead4a4f22c7722b07 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 22 Aug 2011 08:44:45 +0100 Subject: [PATCH] --- yaml --- r: 269409 b: refs/heads/master c: f80cb526e301ab625dd04f6137f9995607348ce3 h: refs/heads/master i: 269407: 1e8d79fc00fa454b99b52b7b47b0b6e38372ed9c v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-lpc32xx/Makefile | 2 +- trunk/drivers/gpio/Makefile | 1 + .../arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c} | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/{arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c} (99%) diff --git a/[refs] b/[refs] index e7329df700f2..af219db63eb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87f911a38d7964b50b3be20da5c06fab69a90576 +refs/heads/master: f80cb526e301ab625dd04f6137f9995607348ce3 diff --git a/trunk/arch/arm/mach-lpc32xx/Makefile b/trunk/arch/arm/mach-lpc32xx/Makefile index a5fc5d0eeaeb..f5db805ab958 100644 --- a/trunk/arch/arm/mach-lpc32xx/Makefile +++ b/trunk/arch/arm/mach-lpc32xx/Makefile @@ -3,6 +3,6 @@ # obj-y := timer.o irq.o common.o serial.o clock.o -obj-y += gpiolib.o pm.o suspend.o +obj-y += pm.o suspend.o obj-y += phy3250.o diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile index 226982277330..33e095bdb65c 100644 --- a/trunk/drivers/gpio/Makefile +++ b/trunk/drivers/gpio/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o obj-$(CONFIG_MACH_KS8695) += gpio-ks8695.o obj-$(CONFIG_GPIO_LANGWELL) += gpio-langwell.o +obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o diff --git a/trunk/arch/arm/mach-lpc32xx/gpiolib.c b/trunk/drivers/gpio/gpio-lpc32xx.c similarity index 99% rename from trunk/arch/arm/mach-lpc32xx/gpiolib.c rename to trunk/drivers/gpio/gpio-lpc32xx.c index 69061ea8997a..b4e9d35a6fa6 100644 --- a/trunk/arch/arm/mach-lpc32xx/gpiolib.c +++ b/trunk/drivers/gpio/gpio-lpc32xx.c @@ -24,7 +24,6 @@ #include #include -#include "common.h" #define LPC32XX_GPIO_P3_INP_STATE _GPREG(0x000) #define LPC32XX_GPIO_P3_OUTP_SET _GPREG(0x004)