From 012bb3e61e5eced6c610f9e036372bf0c8def2d1 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Oct 2000 01:18:40 +0000 Subject: Merge with Linux 2.4.0-test9. Please check DECstation, I had a number of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem. --- arch/arm/mm/mm-clps7500.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'arch/arm/mm/mm-clps7500.c') diff --git a/arch/arm/mm/mm-clps7500.c b/arch/arm/mm/mm-clps7500.c index b9199de80..765367c47 100644 --- a/arch/arm/mm/mm-clps7500.c +++ b/arch/arm/mm/mm-clps7500.c @@ -1,12 +1,11 @@ /* - * arch/arm/mm/mm-cl7500.c + * linux/arch/arm/mm/mm-cl7500.c * - * Extra MM routines for CL7500 architecture + * Copyright (C) 1998 Russell King + * Copyright (C) 1999 Nexus Electronics Ltd * - * Copyright (C) 1998 Russell King - * Copyright (C) 1999 Nexus Electronics Ltd + * Extra MM routines for CL7500 architecture */ - #include #include @@ -14,15 +13,17 @@ #include #include -#include "map.h" - -#define SIZE(x) (sizeof(x) / sizeof(x[0])) +#include -struct map_desc io_desc[] __initdata = { +static struct map_desc cl7500_io_desc[] __initdata = { { IO_BASE, IO_START, IO_SIZE , DOMAIN_IO, 0, 1 }, /* IO space */ { ISA_BASE, ISA_START, ISA_SIZE , DOMAIN_IO, 0, 1 }, /* ISA space */ { FLASH_BASE, FLASH_START, FLASH_SIZE, DOMAIN_IO, 0, 1 }, /* Flash */ - { LED_BASE, LED_START, LED_SIZE , DOMAIN_IO, 0, 1 } /* LED */ + { LED_BASE, LED_START, LED_SIZE , DOMAIN_IO, 0, 1 }, /* LED */ + LAST_DESC }; -unsigned int __initdata io_desc_size = SIZE(io_desc); +void __init clps7500_map_io(void) +{ + iotable_init(cl7500_io_desc); +} -- cgit v1.2.3