---

yaml --- r: 60699 b: refs/heads/master c: b3e998e h: refs/heads/master i: 60697: 2fea3e7 60695: bc09fea v: v3
git-mirror · Jul 10, 2007 · 559e7ed · 559e7ed
1 parent fe3ccb4
commit 559e7ed
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
     }
     /*
@@ Expand Down @@