lkml.org 
[lkml]   [2012]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [Patch] musb: fix a build error on mips
    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
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-02-03 08:19    [W:0.021 / U:60.944 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site