diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-22 04:55:04 -0400 |
---|---|---|
committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-22 04:55:04 -0400 |
commit | ebe2a9ffa148746bae62d0f7188590a85f29f9ed (patch) | |
tree | a441268df8eef09e61b847b4fea1ad3a0aee8a12 /arch/arm/mach-rpc/riscpc.c | |
parent | 522c37b9d3bc2554264c2d7cbba439571a2043fb (diff) |
[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/arm/mach-rpc/riscpc.c')
-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 @@ | |||
32 | 32 | ||
33 | extern void rpc_init_irq(void); | 33 | extern void rpc_init_irq(void); |
34 | 34 | ||
35 | extern unsigned int vram_size; | 35 | unsigned int vram_size; |
36 | |||
37 | #if 0 | ||
38 | |||
39 | unsigned int memc_ctrl_reg; | 36 | unsigned int memc_ctrl_reg; |
40 | unsigned int number_mfm_drives; | 37 | unsigned int number_mfm_drives; |
41 | 38 | ||
@@ -63,8 +60,6 @@ static int __init parse_tag_acorn(const struct tag *tag) | |||
63 | 60 | ||
64 | __tagtable(ATAG_ACORN, parse_tag_acorn); | 61 | __tagtable(ATAG_ACORN, parse_tag_acorn); |
65 | 62 | ||
66 | #endif | ||
67 | |||
68 | static struct map_desc rpc_io_desc[] __initdata = { | 63 | static struct map_desc rpc_io_desc[] __initdata = { |
69 | { SCREEN_BASE, SCREEN_START, 2*1048576, MT_DEVICE }, /* VRAM */ | 64 | { SCREEN_BASE, SCREEN_START, 2*1048576, MT_DEVICE }, /* VRAM */ |
70 | { (u32)IO_BASE, IO_START, IO_SIZE , MT_DEVICE }, /* IO space */ | 65 | { (u32)IO_BASE, IO_START, IO_SIZE , MT_DEVICE }, /* IO space */ |