diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 14:51:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 14:51:06 -0700 |
| commit | a4936044001694f033fe4ea94d6034d51a6b465c (patch) | |
| tree | 4f1caf9899c1859277082422b1fc37901c6097ac /arch/arm/mach-rpc/riscpc.c | |
| parent | 9092131f7ea2f9e92a510ae13ac4d20165aa921c (diff) | |
| parent | 92a8cbed29eb9bf6e8eec16ca29d54015bc0e8a2 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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 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 */ |