projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
omap-secure.h
diff --git
a/arch/arm/plat-omap/include/plat/omap-secure.h
b/arch/arm/plat-omap/include/plat/omap-secure.h
index 64f9d1c7f1bb10787cb556adbf05f693d9b84a88..3047ff923a63cc62747d38aa51686f2a2e2cdc64 100644
(file)
--- 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>
-#if
def 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)