projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 582c77d 243e76b 64be978)
Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 17:19:53 +0000 (10:19 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 17:19:53 +0000 (10:19 -0700)
1  2  3 
arch/arm/mach-omap2/board-4430sdp.c patch | diff1 | diff2 | diff3 | blob | history
arch/arm/plat-omap/include/plat/mmc.h patch | diff1 | diff2 | diff3 | blob | history

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge
diff --cc arch/arm/plat-omap/include/plat/mmc.h
index c5f35f8,4f819fc,0ce3099..f57f36a
--- 1/arch/arm/plat-omap/include/plat/mmc.h
--- 2/arch/arm/plat-omap/include/plat/mmc.h
--- 3/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
Domain: System / Uncategorized;