* [Patch] musb: fix a build error on mips
@ 2012-02-03 7:14 Cong Wang
2012-02-03 7:16 ` Felipe Balbi
0 siblings, 1 reply; 2+ messages in thread
From: Cong Wang @ 2012-02-03 7:14 UTC (permalink / raw)
To: linux-kernel
Cc: Andrew Morton, Felipe Balbi, Greg Kroah-Hartman, WANG Cong, linux-usb
On mips, we got:
drivers/usb/musb/musb_io.h:44: error: conflicting types for 'readsl'
arch/mips/include/asm/io.h:529: error: previous definition of 'readsl' was here
drivers/usb/musb/musb_io.h:46: error: conflicting types for 'readsw'
arch/mips/include/asm/io.h:528: error: previous definition of 'readsw' was here
drivers/usb/musb/musb_io.h:48: error: conflicting types for 'readsb'
so, should add !defined(CONFIG_MIPS) too.
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
---
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index e61aa95..1d5eda2 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -39,7 +39,8 @@
#if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
&& !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \
- && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN)
+ && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \
+ && !defined(CONFIG_MIPS)
static inline void readsl(const void __iomem *addr, void *buf, int len)
{ insl((unsigned long)addr, buf, len); }
static inline void readsw(const void __iomem *addr, void *buf, int len)
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [Patch] musb: fix a build error on mips
2012-02-03 7:14 [Patch] musb: fix a build error on mips Cong Wang
@ 2012-02-03 7:16 ` Felipe Balbi
0 siblings, 0 replies; 2+ messages in thread
From: Felipe Balbi @ 2012-02-03 7:16 UTC (permalink / raw)
To: Cong Wang
Cc: linux-kernel, Andrew Morton, Felipe Balbi, Greg Kroah-Hartman, linux-usb
[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]
Hi,
On Fri, Feb 03, 2012 at 03:14:17PM +0800, Cong Wang wrote:
> On mips, we got:
>
> drivers/usb/musb/musb_io.h:44: error: conflicting types for 'readsl'
> arch/mips/include/asm/io.h:529: error: previous definition of 'readsl' was here
> drivers/usb/musb/musb_io.h:46: error: conflicting types for 'readsw'
> arch/mips/include/asm/io.h:528: error: previous definition of 'readsw' was here
> drivers/usb/musb/musb_io.h:48: error: conflicting types for 'readsb'
>
> so, should add !defined(CONFIG_MIPS) too.
>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
>
> ---
> diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
> index e61aa95..1d5eda2 100644
> --- a/drivers/usb/musb/musb_io.h
> +++ b/drivers/usb/musb/musb_io.h
> @@ -39,7 +39,8 @@
>
> #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
> && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \
> - && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN)
> + && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \
> + && !defined(CONFIG_MIPS)
> static inline void readsl(const void __iomem *addr, void *buf, int len)
> { insl((unsigned long)addr, buf, len); }
> static inline void readsw(const void __iomem *addr, void *buf, int len)
Thanks a lot, will apply.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-03 7:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-03 7:14 [Patch] musb: fix a build error on mips Cong Wang
2012-02-03 7:16 ` Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®