From 6c89e59e07d4ded97e30aecadd231fff0829d0a8 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@snapgear.com>
Date: Mon, 26 Jun 2006 10:33:10 +1000
Subject: [PATCH] --- yaml --- r: 30151 b: refs/heads/master c:
 2082b477dc7e9d5b3f773a36aae2dbc55b4263c2 h: refs/heads/master i:   30149:
 3763694402dd21ed5d6697486dace9a185cb1661   30147:
 208be67bc09db86f55caf81d995bc736067dc3f2   30143:
 ae9cc45f58f876f0f9bd394240a20cbd34d6c1cd v: v3

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

diff --git a/[refs] b/[refs]
index f5ba4870d7be..f31237ec8443 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36a248fadf96cd78c6b344442046db5b85cf9a70
+refs/heads/master: 2082b477dc7e9d5b3f773a36aae2dbc55b4263c2
diff --git a/trunk/arch/m68knommu/mm/init.c b/trunk/arch/m68knommu/mm/init.c
index d79503fe6e42..70d1653be3da 100644
--- a/trunk/arch/m68knommu/mm/init.c
+++ b/trunk/arch/m68knommu/mm/init.c
@@ -63,8 +63,6 @@ static unsigned long empty_bad_page;
 
 unsigned long empty_zero_page;
 
-extern unsigned long rom_length;
-
 void show_mem(void)
 {
     unsigned long i;
@@ -178,11 +176,9 @@ void mem_init(void)
 	initk = (&__init_begin - &__init_end) >> 10;
 
 	tmp = nr_free_pages() << PAGE_SHIFT;
-	printk(KERN_INFO "Memory available: %luk/%luk RAM, %luk/%luk ROM (%dk kernel code, %dk data)\n",
+	printk(KERN_INFO "Memory available: %luk/%luk RAM, (%dk kernel code, %dk data)\n",
 	       tmp >> 10,
 	       len >> 10,
-	       (rom_length > 0) ? ((rom_length >> 10) - codek) : 0,
-	       rom_length >> 10,
 	       codek,
 	       datak
 	       );