patch-2.4.0-test9 linux/arch/arm/mm/mm-clps7500.c

• Lines: 41
• Date: Mon Sep 18 15:15:25 2000
• Orig file: v2.4.0-test8/linux/arch/arm/mm/mm-clps7500.c
• Orig date: Mon Feb 28 14:16:37 2000

diff -u --recursive --new-file v2.4.0-test8/linux/arch/arm/mm/mm-clps7500.c linux/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 <linux/init.h>
 
 #include <asm/hardware.h>
@@ -14,15 +13,17 @@
 #include <asm/proc/domain.h>
 #include <asm/setup.h>
 
-#include "map.h"
-
-#define SIZE(x) (sizeof(x) / sizeof(x[0]))
+#include <asm/mach/map.h>
 
-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);
+}