diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-10 16:33:58 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-10 16:33:58 +0800 |
| commit | bc275dcec0026997a8a8b685ce65c6f766ff38ce (patch) | |
| tree | 2843c602bf5b7b47e2c341c737ababf29280d6fb /include/linux/mtd | |
| parent | ea6aa41b21de5095d17d43776c8a8c472fad9cd4 (diff) | |
| parent | 25b43b8b4163a48612d2d1d5684eedc33bc96b7e (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into imx_3.0.35_android
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index a9e6ba46865e..418fd87002fd 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h @@ -432,7 +432,7 @@ static inline void inline_map_copy_from(struct map_info *map, void *to, unsigned if (map->cached) memcpy(to, (char *)map->cached + from, len); else - memcpy_fromio(to, map->virt + from, len); + memcpy(to, map->virt + from, len); } static inline void inline_map_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) |