On 2/1/12, Kukjin Kim <kgene.kim@xxxxxxxxxxx> wrote: > Since exynos4_init_uarts() can be used for EXYNOS5 SoCs, > this patch changes the name of function to exynos_init_uarts(). > > Signed-off-by: Kukjin Kim <kgene.kim@xxxxxxxxxxx> > --- > arch/arm/mach-exynos/common.c | 8 ++++---- > arch/arm/mach-exynos/common.h | 8 ++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c > index c59e188..a168533 100644 > --- a/arch/arm/mach-exynos/common.c > +++ b/arch/arm/mach-exynos/common.c > @@ -56,7 +56,7 @@ static struct cpu_table cpu_ids[] __initdata = { > .idmask = EXYNOS4_CPU_MASK, > .map_io = exynos4_map_io, > .init_clocks = exynos4_init_clocks, > - .init_uarts = exynos4_init_uarts, > + .init_uarts = exynos_init_uarts, > .init = exynos_init, > .name = name_exynos4210, > }, { > @@ -64,7 +64,7 @@ static struct cpu_table cpu_ids[] __initdata = { > .idmask = EXYNOS4_CPU_MASK, > .map_io = exynos4_map_io, > .init_clocks = exynos4_init_clocks, > - .init_uarts = exynos4_init_uarts, > + .init_uarts = exynos_init_uarts, > .init = exynos_init, > .name = name_exynos4212, > }, { > @@ -72,7 +72,7 @@ static struct cpu_table cpu_ids[] __initdata = { > .idmask = EXYNOS4_CPU_MASK, > .map_io = exynos4_map_io, > .init_clocks = exynos4_init_clocks, > - .init_uarts = exynos4_init_uarts, > + .init_uarts = exynos_init_uarts, > .init = exynos_init, > .name = name_exynos4412, > }, > @@ -476,7 +476,7 @@ int __init exynos_init(void) > > /* uart registration process */ > > -void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no) > +void __init exynos_init_uarts(struct s3c2410_uartcfg *cfg, int no) > { > struct s3c2410_uartcfg *tcfg = cfg; > u32 ucnt; > diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h > index 8c1efe6..2d79aba 100644 > --- a/arch/arm/mach-exynos/common.h > +++ b/arch/arm/mach-exynos/common.h > @@ -36,15 +36,15 @@ extern struct sys_timer exynos4_timer; > > #ifdef CONFIG_ARCH_EXYNOS > extern int exynos_init(void); > +extern void exynos_init_uarts(struct s3c2410_uartcfg *cfg, int no); > extern void exynos4_map_io(void); > extern void exynos4_init_clocks(int xtal); > -extern void exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no); Are there any cases build without CONFIG_ARCH_EXYNOS? I think it's always defined CONFIG_ARCH_EXYNOS. Thank you, Kyungmin Park > > #else > -#define exynos4_init_clocks NULL > -#define exynos4_init_uarts NULL > -#define exynos4_map_io NULL > #define exynos_init NULL > +#define exynos_init_uarts NULL > +#define exynos4_map_io NULL > +#define exynos4_init_clocks NULL > #endif > > #endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */ > -- > 1.7.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" > in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html