[PATCH] ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds

[PATCH] ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds

[Paul Walmsley]

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>
---
Passes a compile test with a 15xx-only config.

 arch/arm/mach-omap1/common.h |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h
index a90b9d7..4193383 100644
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h
@@ -63,6 +63,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 */
-- 
1.7.10

[PATCH] ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [120510 15:31]:
> 
> 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/.

Thanks applying into fixes-for-cleanup branch.

Tony

[PATCH] ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds

[Janusz Krzysztofik]

On Friday 11 of May 2012 09:53:07 Tony Lindgren wrote:
> * Paul Walmsley <paul@pwsan.com> [120510 15:31]:
> > 
> > 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/.
> 
> Thanks applying into fixes-for-cleanup branch.
> 
> Tony

FWIW, works with OMAP1510 only config on my Amstrad Delta.

Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>