lkml.org 
[lkml]   [2011]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/30] ARM: omap: fix build with CONFIG_I2C_OMAP disabled
    Date
    We must not reference omap_i2c_reset if the file defining it
    does not get built.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/arm/plat-omap/include/plat/i2c.h | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h
    index 7c22b9e..ae72013 100644
    --- a/arch/arm/plat-omap/include/plat/i2c.h
    +++ b/arch/arm/plat-omap/include/plat/i2c.h
    @@ -28,6 +28,8 @@
    extern int omap_register_i2c_bus(int bus_id, u32 clkrate,
    struct i2c_board_info const *info,
    unsigned len);
    +struct omap_hwmod;
    +int omap_i2c_reset(struct omap_hwmod *oh);
    #else
    static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,
    struct i2c_board_info const *info,
    @@ -35,6 +37,7 @@ static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,
    {
    return 0;
    }
    +#define omap_i2c_reset NULL
    #endif

    /**
    @@ -53,7 +56,4 @@ struct omap_i2c_dev_attr {
    void __init omap1_i2c_mux_pins(int bus_id);
    void __init omap2_i2c_mux_pins(int bus_id);

    -struct omap_hwmod;
    -int omap_i2c_reset(struct omap_hwmod *oh);
    -
    #endif /* __ASM__ARCH_OMAP_I2C_H */
    --
    1.7.5.4


    \
     
     \ /
      Last update: 2011-10-02 16:51    [W:2.354 / U:0.012 seconds]
    ©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site