From a394b3d4e74f38adaa7815c8492202c81b8c15e0 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Sat, 29 Mar 2008 03:10:50 +1100
Subject: [PATCH] --- yaml --- r: 91489 b: refs/heads/master c:
 fa90f70a8ed338d1afb43da21163752c6558a7d5 h: refs/heads/master i:   91487:
 1065a9fb858de8349099c46b9d9d6da799b1e606 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/powerpc/mm/mem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5eb188e94368..b935e627109b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18f032cb51a6de7d9c875e1112650ecf975fee12
+refs/heads/master: fa90f70a8ed338d1afb43da21163752c6558a7d5
diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c
index 60c019cdc69f..1b119b92a826 100644
--- a/trunk/arch/powerpc/mm/mem.c
+++ b/trunk/arch/powerpc/mm/mem.c
@@ -111,7 +111,7 @@ int memory_add_physaddr_to_nid(u64 start)
 }
 #endif
 
-int __devinit arch_add_memory(int nid, u64 start, u64 size)
+int arch_add_memory(int nid, u64 start, u64 size)
 {
 	struct pglist_data *pgdata;
 	struct zone *zone;