---

yaml --- r: 2815 b: refs/heads/master c: ebe2a9f h: refs/heads/master i: 2813: f3783b9 2811: 3c1152c 2807: 21d435a 2799: ef9c96c 2783: 4891d46 2751: 749c161 2687: fb4d3fd 2559: 6ce3c72 v: v3
git-mirror · Jun 22, 2005 · 17249d3 · 17249d3
1 parent 0d09c32
commit 17249d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 522c37b9d3bc2554264c2d7cbba439571a2043fb
+refs/heads/master: ebe2a9ffa148746bae62d0f7188590a85f29f9ed
diff --git a/trunk/arch/arm/mach-rpc/riscpc.c b/trunk/arch/arm/mach-rpc/riscpc.c
@@ -32,10 +32,7 @@
 
 extern void rpc_init_irq(void);
 
-extern unsigned int vram_size;
-
-#if 0
-
+unsigned int vram_size;
 unsigned int memc_ctrl_reg;
 unsigned int number_mfm_drives;
 
@@ -63,8 +60,6 @@ static int __init parse_tag_acorn(const struct tag *tag)
 
 __tagtable(ATAG_ACORN, parse_tag_acorn);
 
-#endif
-
 static struct map_desc rpc_io_desc[] __initdata = {
  { SCREEN_BASE,	SCREEN_START,	2*1048576, MT_DEVICE }, /* VRAM		*/
  { (u32)IO_BASE, IO_START,	IO_SIZE	 , MT_DEVICE }, /* IO space	*/