diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-01-05 12:39:28 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-15 03:10:12 -0500 |
commit | 9745626b65b856bf58e70feb4eee1e5471db699e (patch) | |
tree | ff9c88340236c8d7d393c551c59947957a6ed719 /arch | |
parent | ed276849bc6a8ad5bb0f9fa94fe8305ee67bb6c6 (diff) |
ARM: SAMSUNG: Move pwm-clock code into plat-samsung
Move the code for the pwm-clock into plat-samsung, as it is common to
all Samsung SoCs.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-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/pwm-clock.c (renamed from arch/arm/plat-s3c/pwm-clock.c) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile index 99f91ad1d555..ef10a9131bba 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 += pwm-clock.o | ||
17 | obj-y += gpio.o | 16 | obj-y += gpio.o |
18 | obj-y += gpio-config.o | 17 | obj-y += gpio-config.o |
19 | 18 | ||
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 7612198bfa59..d4d5f942d34c 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile | |||
@@ -12,5 +12,6 @@ obj- := | |||
12 | # Objects we always build independent of SoC choice | 12 | # Objects we always build independent of SoC choice |
13 | 13 | ||
14 | obj-y += clock.o | 14 | obj-y += clock.o |
15 | obj-y += pwm-clock.o | ||
15 | 16 | ||
16 | obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o | 17 | obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o |
diff --git a/arch/arm/plat-s3c/pwm-clock.c b/arch/arm/plat-samsung/pwm-clock.c index 46c9381e083b..46c9381e083b 100644 --- a/arch/arm/plat-s3c/pwm-clock.c +++ b/arch/arm/plat-samsung/pwm-clock.c | |||