diff options
| author | Santosh Shilimkar | 2012-07-06 11:25:42 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2012-07-09 10:44:11 +0200 |
| commit | fb584511c4664573097ece7df0de06ad00b713a2 (patch) | |
| tree | 852c130e8220bf5f1e28e12277d87a29fa8d37ff /arch/arm/plat-omap | |
| parent | ARM: OMAP2+: dmtimer: cleanup fclk usage (diff) | |
| download | kernel-qcow2-linux-fb584511c4664573097ece7df0de06ad00b713a2.tar.gz kernel-qcow2-linux-fb584511c4664573097ece7df0de06ad00b713a2.tar.xz kernel-qcow2-linux-fb584511c4664573097ece7df0de06ad00b713a2.zip | |
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds
OMAP4 only build breaks with below error
arch/arm/mach-omap2/sdrc.c:135: error: redefinition of 'omap2_sdrc_init'
arch/arm/plat-omap/include/plat/sdrc.h:130: note: previous definition of 'omap2_sdrc_init' was here
make[1]: *** [arch/arm/mach-omap2/sdrc.o] Error 1
Fix the same by using newly introduced CONFIG_SOC_HAS_OMAP2_SDRC marco.
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/sdrc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h index 9bb978ecd884..36d6a7666216 100644 --- a/arch/arm/plat-omap/include/plat/sdrc.h +++ b/arch/arm/plat-omap/include/plat/sdrc.h @@ -123,7 +123,7 @@ struct omap_sdrc_params { u32 mr; }; -#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) +#ifdef CONFIG_SOC_HAS_OMAP2_SDRC void omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0, struct omap_sdrc_params *sdrc_cs1); #else |