diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 15:17:50 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 15:17:50 +0000 |
| commit | 003e6348630aa16982c956beaf7cd0b53a3b609a (patch) | |
| tree | a61ce11b6120ab51a745f37db30cb1b242e80e4d /arch/arm/plat-omap/include/plat/omap-secure.h | |
| parent | 3e343d7a387924b93c43aa0bd8d380a408a0eafe (diff) | |
| parent | 655850ed7e3e90dcb5ae88ae63f75acbf5465213 (diff) | |
| download | linux-003e6348630aa16982c956beaf7cd0b53a3b609a.tar.bz2 | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap-secure.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap-secure.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-secure.h b/arch/arm/plat-omap/include/plat/omap-secure.h index 3047ff923a63..8c7994ce9869 100644 --- a/arch/arm/plat-omap/include/plat/omap-secure.h +++ b/arch/arm/plat-omap/include/plat/omap-secure.h @@ -10,4 +10,10 @@ static inline void omap_secure_ram_reserve_memblock(void) { } #endif +#ifdef CONFIG_OMAP4_ERRATA_I688 +extern int omap_barrier_reserve_memblock(void); +#else +static inline void omap_barrier_reserve_memblock(void) +{ } +#endif #endif /* __OMAP_SECURE_H__ */ |