diff --git a/[refs] b/[refs] index 097c80b63782..222497669684 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 997d0030934f7722d81e5b1cdd7af85ac7ed960b +refs/heads/master: b29fa1fbc210a51103c7a16af44df42cadce0361 diff --git a/trunk/arch/sh/mm/init.c b/trunk/arch/sh/mm/init.c index d1be04204219..fe532aeaa16d 100644 --- a/trunk/arch/sh/mm/init.c +++ b/trunk/arch/sh/mm/init.c @@ -177,10 +177,8 @@ void __init paging_init(void) free_area_init_nodes(max_zone_pfns); -#ifdef CONFIG_SUPERH32 /* Set up the uncached fixmap */ set_fixmap_nocache(FIX_UNCACHED, __pa(&__uncached_start)); -#endif } static struct kcore_list kcore_mem, kcore_vmalloc;