public inbox for linux-m68k@lists.linux-m68k.org
 help / color / mirror / Atom feed
From: Felipe Balbi <balbi@ti.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@vger.kernel.org, Felipe Balbi <balbi@ti.com>,
	Greg Ungerer <gerg@uclinux.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org
Subject: Re: [PATCH] m68k: Make sure {read,write}s[bwl]() are always defined
Date: Mon, 16 Apr 2012 12:30:30 +0300	[thread overview]
Message-ID: <20120416093029.GJ30878@arwen.pp.htv.fi> (raw)
In-Reply-To: <1334516410-5777-1-git-send-email-geert@linux-m68k.org>

[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]

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@linux-m68k.org>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Ungerer <gerg@uclinux.org>

Go ahea Geert, here's my ack.

Acked-by: Felipe Balbi <balbi@ti.com>

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

       reply	other threads:[~2012-04-16  9:30 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1334516410-5777-1-git-send-email-geert@linux-m68k.org>
2012-04-16  9:30 ` Felipe Balbi [this message]
2012-04-16 11:56 ` [PATCH] m68k: Make sure {read,write}s[bwl]() are always defined Greg Ungerer
2012-04-18  7:59   ` Michael Schmitz
2012-04-18 11:49     ` Andreas Schwab
2012-04-18 12:45     ` Greg Ungerer
2012-04-21 20:15 Geert Uytterhoeven
  -- strict thread matches above, loose matches on Subject: below --
2012-04-15 19:00 Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120416093029.GJ30878@arwen.pp.htv.fi \
    --to=balbi@ti.com \
    --cc=geert@linux-m68k.org \
    --cc=gerg@uclinux.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox