diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-26 00:32:09 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-20 17:34:01 -0500 |
| commit | 6ce8fde296e56cda9d7416e015ed2fe495c9c48c (patch) | |
| tree | 2f11dd5bb874de3d35f2592656e168bfbc01b6ac /arch/arm/plat-s3c64xx/Makefile | |
| parent | f7be9abaa5f4a64fdcca6808bb7eacb3547e574e (diff) | |
ARM: S3C64XX: Merge s3c6400-init.c into cpu.c
Since this file is small, and is compiled for both systems in this
architecture merge it into the cpu support file and remove the original
instead of moving it.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c64xx/Makefile')
| -rw-r--r-- | arch/arm/plat-s3c64xx/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/Makefile b/arch/arm/plat-s3c64xx/Makefile index bd4fe3b48eaa..62fc25305ec4 100644 --- a/arch/arm/plat-s3c64xx/Makefile +++ b/arch/arm/plat-s3c64xx/Makefile | |||
| @@ -12,5 +12,4 @@ obj- := | |||
| 12 | 12 | ||
| 13 | # CPU support | 13 | # CPU support |
| 14 | 14 | ||
| 15 | obj-$(CONFIG_CPU_S3C6400_INIT) += s3c6400-init.o | ||
| 16 | obj-$(CONFIG_CPU_S3C6400_CLOCK) += s3c6400-clock.o | 15 | obj-$(CONFIG_CPU_S3C6400_CLOCK) += s3c6400-clock.o |