aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx/cpu.c
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/cpu.c
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/cpu.c')
-rw-r--r--arch/arm/mach-s3c64xx/cpu.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/cpu.c b/arch/arm/mach-s3c64xx/cpu.c
index 410d688a6910..374e45e566b8 100644
--- a/arch/arm/mach-s3c64xx/cpu.c
+++ b/arch/arm/mach-s3c64xx/cpu.c
@@ -129,6 +129,12 @@ static struct sys_device s3c64xx_sysdev = {
129 .cls = &s3c64xx_sysclass, 129 .cls = &s3c64xx_sysclass,
130}; 130};
131 131
132/* uart registration process */
133
134void __init s3c6400_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)
135{
136 s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);
137}
132 138
133/* read cpu identification code */ 139/* read cpu identification code */
134 140