summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-18 11:22:38 +0900
committerBen Dooks <ben-linux@fluff.org>2010-01-19 18:37:19 +0900
commit4f2b617aff8147338faa0d5ed7b57636076671bf (patch)
tree86d4d981b6863eb50d8c534efbf586e45e22f55f /arch/arm
parent67866fb38680d85cbd13c7bb468fb89f16e026d1 (diff)
downloadblackbird-obmc-linux-4f2b617aff8147338faa0d5ed7b57636076671bf.tar.gz
blackbird-obmc-linux-4f2b617aff8147338faa0d5ed7b57636076671bf.zip
ARM: SAMSUNG: Move gpiolib support in gpio.c to plat-samsung
Move the gpio.c code containing the core gpiolib and GPIO support to plat-samsung from plat-s3c as it is used by all current Samsung SoCs. Note, we didn't move this to gpiolib.c as it contains code that is not strictly for gpiolib support and the 4bit code is already called gpiolib.c so make the change easier by not renaming both files in one go. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-s3c/Makefile1
-rw-r--r--arch/arm/plat-samsung/Makefile1
-rw-r--r--arch/arm/plat-samsung/gpio.c (renamed from arch/arm/plat-s3c/gpio.c)0
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
index ac12ba526f77..20cb335aa75b 100644
--- a/arch/arm/plat-s3c/Makefile
+++ b/arch/arm/plat-s3c/Makefile
@@ -13,7 +13,6 @@ obj- :=
obj-y += init.o
obj-y += time.o
-obj-y += gpio.o
# DMA support
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 94fe6ea362be..27d5bfb60b2e 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -13,6 +13,7 @@ obj- :=
obj-y += clock.o
obj-y += pwm-clock.o
+obj-y += gpio.o
obj-y += gpio-config.o
obj-$(CONFIG_SAMSUNG_GPIOLIB_4BIT) += gpiolib.o
diff --git a/arch/arm/plat-s3c/gpio.c b/arch/arm/plat-samsung/gpio.c
index 5ff24e0f9f89..5ff24e0f9f89 100644
--- a/arch/arm/plat-s3c/gpio.c
+++ b/arch/arm/plat-samsung/gpio.c
OpenPOWER on IntegriCloud