From 17249d34c5ac6cfd4db8e93358382ae22ec91cab Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 22 Jun 2005 09:55:04 +0100 Subject: [PATCH] --- yaml --- r: 2815 b: refs/heads/master c: ebe2a9ffa148746bae62d0f7188590a85f29f9ed h: refs/heads/master i: 2813: f3783b94d8c0481de5f290a79b5afca95d3e87a6 2811: 3c1152c2cf00832704b52761cb0c5ce316aec0fb 2807: 21d435af85fd3e429c93f5c5f774c74337f9d907 2799: ef9c96c1e5b74b2af91ea28abbaa6e5d8b605c27 2783: 4891d4685e612776dcf0e1003c6e93ae2deea6b0 2751: 749c161e750fabe56d6f08a898606ad26ca00649 2687: fb4d3fd71311390954424f5c66ca773ce88d6d05 2559: 6ce3c72ae977dc13ca21318b58b0339b167e8028 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-rpc/riscpc.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d7e46eecc9c7..4cf032d54af1 100644 --- 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 index 815c53225cd8..437106881436 100644 --- 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 */