diff --git a/[refs] b/[refs] index 445b0307607d..cb66108ba35b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 709c4efb68cccd2de9a7d63b1f90276b1617e613 +refs/heads/master: 9ea5973883bbe26372f45d99eb3a500f08d966f9 diff --git a/trunk/include/linux/mtd/map.h b/trunk/include/linux/mtd/map.h index 01703d425986..de89eca864ce 100644 --- a/trunk/include/linux/mtd/map.h +++ b/trunk/include/linux/mtd/map.h @@ -387,6 +387,8 @@ static inline map_word inline_map_read(struct map_info *map, unsigned long ofs) #endif else if (map_bankwidth_is_large(map)) memcpy_fromio(r.x, map->virt+ofs, map->bankwidth); + else + BUG(); return r; }