Re: [PATCH] m68k: Make sure {read,write}s[bwl]() are always defined

From: Felipe Balbi
Date: Mon Apr 16 2012 - 05:31:25 EST

On Sun, Apr 15, 2012 at 09:00:10PM +0200, Geert Uytterhoeven wrote:
> If CONFIG_ATARI_ROM_ISA is defined (e.g. allmodconfig), musb fails to
> compile with:
> In file included from drivers/usb/musb/musb_core.h:68,
> from drivers/usb/musb/musb_core.c:104:
> drivers/usb/musb/musb_io.h:45: error: conflicting types for âraw_inslâ
> arch/m68k/include/asm/raw_io.h:200: error: previous definition of âraw_inslâ was here
> drivers/usb/musb/musb_io.h:47: error: conflicting types for âraw_inswâ
> arch/m68k/include/asm/raw_io.h:121: error: previous definition of âraw_inswâ was here
> drivers/usb/musb/musb_io.h:52: error: conflicting types for âraw_outslâ
> arch/m68k/include/asm/raw_io.h:240: error: previous definition of âraw_outslâ was here
> drivers/usb/musb/musb_io.h:54: error: conflicting types for âraw_outswâ
> arch/m68k/include/asm/raw_io.h:161: error: previous definition of âraw_outswâ was here
> make[4]: *** [drivers/usb/musb/musb_core.o] Error 1
> This happens because musb_io.h provides default implementations for
> {read,write}s[bwl]() on most platforms, some of which conflict with their
> Atari ROM ISA counterparts.
> To avoid adding a check for CONFIG_ATARI_ROM_ISA to musb_io.h, make sure
> {read,write}s[bwl]() are always defined on m68k, and disable the default
> implementations in musb_io.h on m68k, like is already done for several
> other architectures.
> Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> Cc: Felipe Balbi <balbi@xxxxxx>
> Cc: Greg Ungerer <gerg@xxxxxxxxxxx>

Go ahea Geert, here's my ack.

Acked-by: Felipe Balbi <balbi@xxxxxx>


Attachment: signature.asc
Description: Digital signature