From: Tony Lindgren Date: Fri, 8 Oct 2010 17:19:53 +0000 (-0700) Subject: Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=73c5ef126f40b0b872e5964ff65dbe792eeec493;p=linux-edison.git Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus --- 73c5ef126f40b0b872e5964ff65dbe792eeec493 diff --cc arch/arm/plat-omap/include/plat/mmc.h index c5f35f87dea,4f819fc261b,0ce3099b1eb..f57f36abb07 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@@@ -71,14 -71,11 -71,14 +71,17 @@@@ struct omap_mmc_platform_data u64 dma_mask; ++ /* Register offset deviation */ ++ u16 reg_offset; ++ struct omap_mmc_slot_data { -- /* 4/8 wires and any additional host capabilities -- * need to OR'd all capabilities (ref. linux/mmc/host.h) */ -- u32 caps; ++ /* ++ * 4/8 wires and any additional host capabilities ++ * need to OR'd all capabilities (ref. linux/mmc/host.h) ++ */ ++ u8 wires; /* Used for the MMC driver on omap1 and 2420 */ ++ u32 caps; /* Used for the MMC driver on 2430 and later */ /* * nomux means "standard" muxing is wrong on this board, and