From 2428835fc6a579b68dde16d37e0b72ca29259c96 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 22 Aug 2011 08:49:07 +0100 Subject: [PATCH] ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem As per example from the other ARM boards, push the SA100 GPIO driver down to the GPIO subsystem so it can be consolidated. Signed-off-by: Linus Walleij Signed-off-by: Russell King --- arch/arm/mach-sa1100/Makefile | 2 +- drivers/gpio/Makefile | 2 +- arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) rename arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c (98%) diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile index 41252d22e659..73a5c6431792 100644 --- a/arch/arm/mach-sa1100/Makefile +++ b/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/drivers/gpio/Makefile b/drivers/gpio/Makefile index 33e095bdb65c..84bc7389e367 100644 --- a/drivers/gpio/Makefile +++ b/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/arch/arm/mach-sa1100/gpio.c b/drivers/gpio/gpio-sa1100.c similarity index 98% rename from arch/arm/mach-sa1100/gpio.c rename to drivers/gpio/gpio-sa1100.c index e547ed41ec6b..b6c1f6d80649 100644 --- a/arch/arm/mach-sa1100/gpio.c +++ b/drivers/gpio/gpio-sa1100.c @@ -12,7 +12,6 @@ #include #include -#include "generic.h" static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset) { -- 2.34.1