diff options
| author |  Tony Lindgren <tony@atomide.com>
| 2012-02-24 16:48:27 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com>
| 2012-02-24 16:48:27 -0800 |
| commit | ffd76d8be36da09f8456c55569c008f5aa93095e (patch) | |
| tree | 4a5e537edcdd3be9197c5fb7af1b4f7e4780ef77 /arch/arm/plat-omap | |
| parent | ARM: OMAP2+: Set Kconfig dependencies for PROC_DEVICETREE (diff) | |
| parent | arm/dts: Add support for TI OMAP3 EVM board (diff) | |
| download | linux-ffd76d8be36da09f8456c55569c008f5aa93095e.tar.gz linux-ffd76d8be36da09f8456c55569c008f5aa93095e.tar.bz2 linux-ffd76d8be36da09f8456c55569c008f5aa93095e.zip | |
Merge branch 'for_3.4/dts_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap-secure.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-secure.h b/arch/arm/plat-omap/include/plat/omap-secure.h index 64f9d1c7f1bb..3047ff923a63 100644 --- a/arch/arm/plat-omap/include/plat/omap-secure.h +++ b/arch/arm/plat-omap/include/plat/omap-secure.h @@ -3,7 +3,7 @@ #include <linux/types.h> -#ifdef CONFIG_ARCH_OMAP2PLUS +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) extern int omap_secure_ram_reserve_memblock(void); #else static inline void omap_secure_ram_reserve_memblock(void) |