diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-09-27 10:15:47 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-09-27 10:15:47 -0700 |
| commit | b245f26f5e45a6513a318835d83eea895d3ab54b (patch) | |
| tree | ae5cfe08d7152ad28101e642942fc7fb56386322 /arch/arm/plat-omap/include | |
| parent | 5a37e7840f445b551b8bdba3b4f10f7ea365dcfc (diff) | |
| parent | 3a63833ec3002816a759a49ebda4e229c089114e (diff) | |
| download | blackbird-op-linux-b245f26f5e45a6513a318835d83eea895d3ab54b.tar.gz blackbird-op-linux-b245f26f5e45a6513a318835d83eea895d3ab54b.zip | |
Merge branch 'devel-omap-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/include')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/i2c.h | 4 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mmc.h | 7 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/usb.h | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h index 87f6bf2ea4fa..36a0befd6168 100644 --- a/arch/arm/plat-omap/include/plat/i2c.h +++ b/arch/arm/plat-omap/include/plat/i2c.h @@ -18,6 +18,8 @@ * 02110-1301 USA * */ +#ifndef __ASM__ARCH_OMAP_I2C_H +#define __ASM__ARCH_OMAP_I2C_H #include <linux/i2c.h> @@ -36,3 +38,5 @@ static inline int omap_register_i2c_bus(int bus_id, u32 clkrate, void __init omap1_i2c_mux_pins(int bus_id); void __init omap2_i2c_mux_pins(int bus_id); + +#endif /* __ASM__ARCH_OMAP_I2C_H */ diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index 9b89ec601ee2..4f819fc261b7 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@ -73,10 +73,9 @@ struct omap_mmc_platform_data { struct omap_mmc_slot_data { - /* 4 wire signaling is optional, and is used for SD/SDIO/HSMMC; - * 8 wire signaling is also optional, and is used with HSMMC - */ - u8 wires; + /* 4/8 wires and any additional host capabilities + * need to OR'd all capabilities (ref. linux/mmc/host.h) */ + u32 caps; /* * nomux means "standard" muxing is wrong on this board, and diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h index 2a9427c8cc48..667456228a12 100644 --- a/arch/arm/plat-omap/include/plat/usb.h +++ b/arch/arm/plat-omap/include/plat/usb.h @@ -105,7 +105,7 @@ static inline void omap1_usb_init(struct omap_usb_config *pdata) #if defined(CONFIG_ARCH_OMAP_OTG) || defined(CONFIG_ARCH_OMAP_OTG_MODULE) void omap2_usbfs_init(struct omap_usb_config *pdata); #else -static inline omap2_usbfs_init(struct omap_usb_config *pdata) +static inline void omap2_usbfs_init(struct omap_usb_config *pdata) { } #endif |
