summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-05-12 09:21:51 +0400
committerOlof Johansson <olof@lixom.net>2012-05-12 09:21:51 +0400
commiteb9eef616b0ce14d554f75da197c0bfee8d2132f (patch)
tree17c93adeb2d2f9317ae14a1f350282e06f504f30 /arch/arm/mach-omap1
parent86822f816fc9a42fd210e35d4881e988406497c0 (diff)
parent19b08b33fa4c60d66d4e341d4d1d9a6e86ffc9e6 (diff)
downloadlinux-eb9eef616b0ce14d554f75da197c0bfee8d2132f.tar.xz
Merge branch 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
* 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: OTG integration: fix compiler warning ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r--arch/arm/mach-omap1/common.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h
index 8cc616e6f54a..bb7779b57795 100644
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h
@@ -67,6 +67,10 @@ extern bool omap_32k_timer_init(void);
extern u32 omap_irq_flags;
+#ifdef CONFIG_ARCH_OMAP16XX
extern int ocpi_enable(void);
+#else
+static inline int ocpi_enable(void) { return 0; }
+#endif
#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */