diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-08-22 08:44:45 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-22 09:13:21 +0100 |
| commit | f80cb526e301ab625dd04f6137f9995607348ce3 (patch) | |
| tree | 286a6e2823820f9886cee5ae7ce6b7446b4358cd | |
| parent | 87f911a38d7964b50b3be20da5c06fab69a90576 (diff) | |
| download | op-kernel-dev-f80cb526e301ab625dd04f6137f9995607348ce3.zip op-kernel-dev-f80cb526e301ab625dd04f6137f9995607348ce3.tar.gz | |
ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
As per example from the other ARM boards, push the LPC32XX
GPIO driver down to the GPIO subsystem so it can be consolidated.
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Barry Song <bs14@csr.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-lpc32xx/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpio/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpio/gpio-lpc32xx.c (renamed from arch/arm/mach-lpc32xx/gpiolib.c) | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-lpc32xx/Makefile b/arch/arm/mach-lpc32xx/Makefile index a5fc5d0..f5db805 100644 --- a/arch/arm/mach-lpc32xx/Makefile +++ b/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/drivers/gpio/Makefile b/drivers/gpio/Makefile index 2269822..33e095bd 100644 --- a/drivers/gpio/Makefile +++ b/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/arch/arm/mach-lpc32xx/gpiolib.c b/drivers/gpio/gpio-lpc32xx.c index 69061ea..b4e9d35 100644 --- a/arch/arm/mach-lpc32xx/gpiolib.c +++ b/drivers/gpio/gpio-lpc32xx.c @@ -24,7 +24,6 @@ #include <mach/hardware.h> #include <mach/platform.h> -#include "common.h" #define LPC32XX_GPIO_P3_INP_STATE _GPREG(0x000) #define LPC32XX_GPIO_P3_OUTP_SET _GPREG(0x004) |
