diff --git a/[refs] b/[refs] index e66e5847d046..9e41b0b7f9f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc6b73e14e11b19d43c89920aa516813459c84da +refs/heads/master: b3e998ee05773a3ac33d540aa341295acef4c56b diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c index 2c8790f36be2..f0e7eedb1ba3 100644 --- a/trunk/arch/powerpc/mm/mem.c +++ b/trunk/arch/powerpc/mm/mem.c @@ -128,8 +128,6 @@ int __devinit arch_add_memory(int nid, u64 start, u64 size) zone = pgdata->node_zones; return __add_pages(zone, start_pfn, nr_pages); - - return 0; } /*