summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/common.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-06-26 09:40:43 +0400
committerDavid S. Miller <davem@davemloft.net>2014-06-26 09:40:43 +0400
commit9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525 (patch)
treebca8230897630ca6721bdd7b959142984afa256a /arch/arm/mach-omap2/common.h
parent644a918d20336a7deaa81f675c3c2f25bf3dafbb (diff)
parentd7933ab727ed035bdf420d7381b831ba959cecc5 (diff)
downloadlinux-9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
-rw-r--r--arch/arm/mach-omap2/common.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index ff029737c8f0..a373d508799a 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -91,7 +91,14 @@ extern void omap3_sync32k_timer_init(void);
extern void omap3_secure_sync32k_timer_init(void);
extern void omap3_gptimer_timer_init(void);
extern void omap4_local_timer_init(void);
+#ifdef CONFIG_CACHE_L2X0
int omap_l2_cache_init(void);
+#else
+static inline int omap_l2_cache_init(void)
+{
+ return 0;
+}
+#endif
extern void omap5_realtime_timer_init(void);
void omap2420_init_early(void);