aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx/Kconfig
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-26 00:32:09 -0500
committerBen Dooks <ben-linux@fluff.org>2010-02-20 17:34:01 -0500
commit6ce8fde296e56cda9d7416e015ed2fe495c9c48c (patch)
tree2f11dd5bb874de3d35f2592656e168bfbc01b6ac /arch/arm/mach-s3c64xx/Kconfig
parentf7be9abaa5f4a64fdcca6808bb7eacb3547e574e (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/mach-s3c64xx/Kconfig')
-rw-r--r--arch/arm/mach-s3c64xx/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 7c9cd9a9901a..33d82b1c9eff 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -7,14 +7,12 @@
7 7
8config CPU_S3C6400 8config CPU_S3C6400
9 bool 9 bool
10 select CPU_S3C6400_INIT
11 select CPU_S3C6400_CLOCK 10 select CPU_S3C6400_CLOCK
12 help 11 help
13 Enable S3C6400 CPU support 12 Enable S3C6400 CPU support
14 13
15config CPU_S3C6410 14config CPU_S3C6410
16 bool 15 bool
17 select CPU_S3C6400_INIT
18 select CPU_S3C6400_CLOCK 16 select CPU_S3C6400_CLOCK
19 help 17 help
20 Enable S3C6410 CPU support 18 Enable S3C6410 CPU support