diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-12-23 13:43:48 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-15 03:10:11 -0500 |
commit | 2c2f69b15d5420291a941ace10149e76f0af7ab0 (patch) | |
tree | d2e8725f81cc0b877658dd828a7f40d45f88df01 | |
parent | 682e2b7d45878586ce84f6993da0b8a2981a399d (diff) |
ARM: SAMSUNG: Move clock.c to arch/arm/plat-samsung
This is the core implementation of the clock code for all Samsung based
SoCs, so move it to arch/arm/plat-samsung (the clock.h file has already
been moved).
Since the file is built for every Samsung SoC, no changes are needed to the
Kconfig system.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/plat-s3c/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/plat-samsung/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/plat-samsung/clock.c (renamed from arch/arm/plat-s3c/clock.c) | 0 |
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile index 50444da98425..99f91ad1d555 100644 --- a/arch/arm/plat-s3c/Makefile +++ b/arch/arm/plat-s3c/Makefile | |||
@@ -11,9 +11,8 @@ obj- := | |||
11 | 11 | ||
12 | # Core support for all Samsung SoCs | 12 | # Core support for all Samsung SoCs |
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 += clock.o | ||
17 | obj-y += pwm-clock.o | 16 | obj-y += pwm-clock.o |
18 | obj-y += gpio.o | 17 | obj-y += gpio.o |
19 | obj-y += gpio-config.o | 18 | obj-y += gpio-config.o |
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index ce736ce468fd..7612198bfa59 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile | |||
@@ -9,4 +9,8 @@ obj-m := | |||
9 | obj-n := dummy.o | 9 | obj-n := dummy.o |
10 | obj- := | 10 | obj- := |
11 | 11 | ||
12 | # Objects we always build independent of SoC choice | ||
13 | |||
14 | obj-y += clock.o | ||
15 | |||
12 | obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o | 16 | obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o |
diff --git a/arch/arm/plat-s3c/clock.c b/arch/arm/plat-samsung/clock.c index fa91125c7e0e..fa91125c7e0e 100644 --- a/arch/arm/plat-s3c/clock.c +++ b/arch/arm/plat-samsung/clock.c | |||