Commit 121e1a73 authored May 10, 2012 by Paul Walmsley Committed by Tony Lindgren May 11, 2012

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 d3645d39
("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>

parent 09f45b83

arch/arm/mach-omap1/common.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -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 */