diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-09-28 09:10:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-01 23:41:41 +0100 |
| commit | 354bf8010ffea1ca5accd9fae26b7373df96bcb7 (patch) | |
| tree | 80bcb552771d44e9974de2a89b5b40213cef7e44 | |
| parent | bd5f12a24766c1f299def0a78b008d4746f528f2 (diff) | |
ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
As per example from the other ARM boards, push the PXA
GPIO driver down to the GPIO subsystem so it can be consolidated.
Acked-by: Eric Miao <eric.y.miao@gmail.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/plat-pxa/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpio/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpio/gpio-pxa.c (renamed from arch/arm/plat-pxa/gpio.c) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile index 3aca5ba0f87..f302d048392 100644 --- a/arch/arm/plat-pxa/Makefile +++ b/arch/arm/plat-pxa/Makefile @@ -4,7 +4,6 @@ obj-y := dma.o -obj-$(CONFIG_GENERIC_GPIO) += gpio.o obj-$(CONFIG_PXA3xx) += mfp.o obj-$(CONFIG_PXA95x) += mfp.o obj-$(CONFIG_ARCH_MMP) += mfp.o diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 84bc7389e36..19c5d27b6d2 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -40,6 +40,7 @@ obj-$(CONFIG_GPIO_PCA953X) += gpio-pca953x.o obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o obj-$(CONFIG_GPIO_PCH) += gpio-pch.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o +obj-$(CONFIG_PLAT_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o diff --git a/arch/arm/plat-pxa/gpio.c b/drivers/gpio/gpio-pxa.c index 5d6a86bfc68..5d6a86bfc68 100644 --- a/arch/arm/plat-pxa/gpio.c +++ b/drivers/gpio/gpio-pxa.c |