From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 22 Jun 2005 08:55:04 +0000 (+0100)
Subject: [PATCH] ARM: Allow riscpc to parse "acorn" boot info tag
X-Git-Tag: v2.6.13-rc4~130^2~156^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ebe2a9ffa148746bae62d0f7188590a85f29f9ed;p=~shefty%2Frdma-dev.git

[PATCH] ARM: Allow riscpc to parse "acorn" boot info tag

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c
index 815c53225cd..43710688143 100644
--- a/arch/arm/mach-rpc/riscpc.c
+++ b/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	*/