Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latest

diff --cc include/linux/mmc/sh_mmcif.h
index 5c99da1078aa2e2906e0cc8f06428c231f76970a,44fc5348fd5d7c33dec9f28f1c3227904f8776c1,cfcc6e320e2fa5d3823bbf58b3747c1cf10fe147..bf173502d74418784c0c12128b43419a1242ceb3
--- 1/include/linux/mmc/sh_mmcif.h
--- 2/include/linux/mmc/sh_mmcif.h
--- 3/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@@@ -177,25 -209,27 -216,4 +223,4 @@@@ static inline void sh_mmcif_boot_init(v
        sh_mmcif_boot_cmd(base, 0x03400040, 0x00010000);
   }
   
-- static inline void sh_mmcif_boot_slurp(void __iomem *base,
--                                     unsigned char *buf,
--                                     unsigned long no_bytes)
-- {
--      unsigned long tmp;
-- 
--      /* In data transfer mode: Set clock to Bus clock/4 (about 20Mhz) */
-       sh_mmcif_writel(base, MMCIF_CE_CLK_CTRL, 0x01012fff);
 -      sh_mmcif_writel(base, MMCIF_CE_CLK_CTRL,
 -                      CLK_ENABLE | CLKDIV_4 | SRSPTO_256 |
 -                      SRBSYTO_29 | SRWDTO_29 | SCCSTO_29);
-- 
--      /* CMD9 - Get CSD */
--      sh_mmcif_boot_cmd(base, 0x09806000, 0x00010000);
-- 
--      /* CMD7 - Select the card */
--      sh_mmcif_boot_cmd(base, 0x07400000, 0x00010000);
-- 
--      tmp = no_bytes / SH_MMCIF_BBS;
--      tmp += (no_bytes % SH_MMCIF_BBS) ? 1 : 0;
-- 
--      sh_mmcif_boot_do_read(base, 512, tmp, buf);
-- }
-- 
   #endif /* __SH_MMCIF_H__ */