diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 17:41:04 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 17:41:04 -0500 |
| commit | 88fa269bedc3ae0f67426ea7fe9d306103b7fb1c (patch) | |
| tree | 6f42d4d462f52ce8fe6eac3bf6c5922f2649f7e4 /arch/arm/plat-omap/include/plat/omap-secure.h | |
| parent | e9c6c5dfd1dba03802b98aea518c08ab48cbbcc4 (diff) | |
| parent | 1e056dddabc1b7a909d1f992fefb1d5d5bc8ff0d (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2xxx: PM: fix OMAP2xxx-specific UART idle bug in v3.3
ARM: OMAP3: cm-t35: fix section mismatch warning
ARM: OMAP2: Fix the OMAP2 only build break seen with 2011+ ARM tool-chains
ARM: OMAP2+: board-generic: Add missing handle_irq callbacks
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap-secure.h')
| -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 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_ARCH_OMAP2PLUS | 6 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) |
| 7 | extern int omap_secure_ram_reserve_memblock(void); | 7 | extern int omap_secure_ram_reserve_memblock(void); |
| 8 | #else | 8 | #else |
| 9 | static inline void omap_secure_ram_reserve_memblock(void) | 9 | static inline void omap_secure_ram_reserve_memblock(void) |