diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-22 09:55:04 +0100 |
|---|---|---|
| committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-22 09:55:04 +0100 |
| commit | ebe2a9ffa148746bae62d0f7188590a85f29f9ed (patch) | |
| tree | a441268df8eef09e61b847b4fea1ad3a0aee8a12 /arch | |
| parent | [PATCH] ARM: Fix sa1111.c build error caused by klist changes (diff) | |
| download | linux-dev-ebe2a9ffa148746bae62d0f7188590a85f29f9ed.tar.xz linux-dev-ebe2a9ffa148746bae62d0f7188590a85f29f9ed.zip | |
[PATCH] ARM: Allow riscpc to parse "acorn" boot info tag
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-rpc/riscpc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c index 815c53225cd8..437106881436 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 */ |