diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-12-23 19:43:48 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-15 09:10:11 +0100 |
| commit | 2c2f69b15d5420291a941ace10149e76f0af7ab0 (patch) | |
| tree | d2e8725f81cc0b877658dd828a7f40d45f88df01 /arch | |
| parent | ARM: S3C64XX: Avoid announcing clksrc clocks twice (diff) | |
| download | linux-2c2f69b15d5420291a941ace10149e76f0af7ab0.tar.xz linux-2c2f69b15d5420291a941ace10149e76f0af7ab0.zip | |
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>
Diffstat (limited to 'arch')
| -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- := # Core support for all Samsung SoCs -obj-y += init.o +obj-y += init.o obj-y += time.o -obj-y += clock.o obj-y += pwm-clock.o obj-y += gpio.o 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 := obj-n := dummy.o obj- := +# Objects we always build independent of SoC choice + +obj-y += clock.o + 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 |