---

yaml --- r: 30151 b: refs/heads/master c: 2082b47 h: refs/heads/master i: 30149: 3763694 30147: 208be67 30143: ae9cc45 v: v3
git-mirror · Jun 26, 2006 · 6c89e59 · 6c89e59
1 parent cb2e3a3
commit 6c89e59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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
 	       );