aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-10-31 16:15:01 +0000
committerBen Dooks <ben-linux@fluff.org>2008-12-15 23:48:20 +0000
commit6a5f4b8535868ada539ea2479d4f0a6c694b3908 (patch)
tree7715e1d027c6d997037badf31c6ce547af44dd09
parent3627379fc6b3e2b531b371af97d8ce0040fc3646 (diff)
[ARM] S3C64XX: Fix missing definition of s3c64xx_init_io()
The function s3c64xx_init_io was missing from <plat/cpu.h> and was masked by the SMDK6410 having an local definition. Fix by removing the SMDK6410 variant and adding it to the relevant <plat/cpu.h> file. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/mach-s3c6410/mach-smdk6410.c2
-rw-r--r--arch/arm/plat-s3c/include/plat/cpu.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c
index 35d42e8cab9..9213a8ba283 100644
--- a/arch/arm/mach-s3c6410/mach-smdk6410.c
+++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
@@ -64,8 +64,6 @@ struct map_desc smdk6410_iodesc[] = {};
static struct platform_device *smdk6410_devices[] __initdata = {
};
-extern void s3c64xx_init_io(struct map_desc *, int);
-
static void __init smdk6410_map_io(void)
{
s3c64xx_init_io(smdk6410_iodesc, ARRAY_SIZE(smdk6410_iodesc));
diff --git a/arch/arm/plat-s3c/include/plat/cpu.h b/arch/arm/plat-s3c/include/plat/cpu.h
index 6d89a4637f3..e62ae0fcfe5 100644
--- a/arch/arm/plat-s3c/include/plat/cpu.h
+++ b/arch/arm/plat-s3c/include/plat/cpu.h
@@ -47,6 +47,7 @@ extern void s3c24xx_init_irq(void);
extern void s3c64xx_init_irq(u32 vic0, u32 vic1);
extern void s3c24xx_init_io(struct map_desc *mach_desc, int size);
+extern void s3c64xx_init_io(struct map_desc *mach_desc, int size);
extern void s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no);