diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-01-17 21:22:38 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:37:19 -0500 |
commit | 4f2b617aff8147338faa0d5ed7b57636076671bf (patch) | |
tree | 86d4d981b6863eb50d8c534efbf586e45e22f55f | |
parent | 67866fb38680d85cbd13c7bb468fb89f16e026d1 (diff) |
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>
-rw-r--r-- | arch/arm/plat-s3c/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/plat-samsung/Makefile | 1 | ||||
-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- := | |||
13 | 13 | ||
14 | obj-y += init.o | 14 | obj-y += init.o |
15 | obj-y += time.o | 15 | obj-y += time.o |
16 | obj-y += gpio.o | ||
17 | 16 | ||
18 | # DMA support | 17 | # DMA support |
19 | 18 | ||
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- := | |||
13 | 13 | ||
14 | obj-y += clock.o | 14 | obj-y += clock.o |
15 | obj-y += pwm-clock.o | 15 | obj-y += pwm-clock.o |
16 | obj-y += gpio.o | ||
16 | obj-y += gpio-config.o | 17 | obj-y += gpio-config.o |
17 | 18 | ||
18 | obj-$(CONFIG_SAMSUNG_GPIOLIB_4BIT) += gpiolib.o | 19 | 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 | |||