summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/common.h
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-05-10 16:27:23 -0600
committerTony Lindgren <tony@atomide.com>2012-05-11 09:51:26 -0700
commit121e1a73a6246df206e779cc163ce95fbd300877 (patch)
tree1814d6981f1a4ee06989109fbc9d22bc66032f09 /arch/arm/mach-omap1/common.h
parent09f45b83109cb8e23a06d5efb1096a08a9545974 (diff)
downloadlinux-121e1a73a6246df206e779cc163ce95fbd300877.tar.bz2
ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds
Janusz Krzysztofik reported the following build break on OMAP1 builds that don't include CONFIG_ARCH_OMAP16XX: LD .tmp_vmlinux1 arch/arm/mach-omap1/built-in.o: In function `omap1_usb_init': lcd_dma.c:(.init.text+0x1420): undefined reference to `ocpi_enable' make: *** [.tmp_vmlinux1] Error 1 This was caused by commit d3645d39ad0ed9f09535065676ea0ba114f93cdf ("ARM: OMAP1: OHCI: use platform_data fn ptr to enable OCPI bus"). Fix by declaring an empty ocpi_enable() on non-16XX builds, which should work until the OCPI code is moved out to drivers/. Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com> Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/common.h')
-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 */