From 5816257086fcd70c3a7aab0e50cec41f12bfde08 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 9 Nov 2007 15:02:43 -0800
Subject: [PATCH] --- yaml --- r: 73242 b: refs/heads/master c:
 98d74e08b1194acea2626da22376a2aacabcf67e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f769a4d5ed9e..298bb2cf9f29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45e5421eb5bbcd9efa037d682dd357284e3ef982
+refs/heads/master: 98d74e08b1194acea2626da22376a2aacabcf67e
diff --git a/trunk/arch/frv/mm/init.c b/trunk/arch/frv/mm/init.c
index 4103c2c487f3..b841ecfd5d5a 100644
--- a/trunk/arch/frv/mm/init.c
+++ b/trunk/arch/frv/mm/init.c
@@ -197,7 +197,7 @@ void __init mem_init(void)
 /*
  * free the memory that was only required for initialisation
  */
-void __init free_initmem(void)
+void free_initmem(void)
 {
 #if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL)
 	unsigned long start, end, addr;