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

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

diff -u --recursive --new-file v2.4.0-test8/linux/arch/arm/mm/mm-nexuspci.c linux/arch/arm/mm/mm-nexuspci.c
@@ -1,13 +1,12 @@
 /*
- * arch/arm/mm/mm-nexuspci.c
- *  from arch/arm/mm/mm-ebsa110.c
+ *  linux/arch/arm/mm/mm-nexuspci.c
+ *   from linux/arch/arm/mm/mm-ebsa110.c
  *
- * Extra MM routines for the FTV/PCI architecture
+ *  Copyright (C) 1998-1999 Phil Blundell
+ *  Copyright (C) 1998-1999 Russell King
  *
- * Copyright (C) 1998-1999 Phil Blundell
- * Copyright (C) 1998-1999 Russell King
+ *  Extra MM routines for the FTV/PCI architecture
  */
-
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/init.h>
@@ -16,16 +15,18 @@
 #include <asm/page.h>
 #include <asm/io.h>
 
-#include "map.h"
- 
-struct map_desc io_desc[] __initdata = {
+#include <asm/mach/map.h>
+
+static struct map_desc nexuspci_io_desc[] __initdata = {
  	{ INTCONT_BASE,	INTCONT_START,	0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
  	{ PLX_BASE,	PLX_START,	0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
  	{ PCIO_BASE,	PLX_IO_START,	0x00100000, DOMAIN_IO, 0, 1, 0, 0 },
  	{ DUART_BASE,	DUART_START,	0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
-	{ STATUS_BASE,	STATUS_START,	0x00001000, DOMAIN_IO, 0, 1, 0, 0 }
+	{ STATUS_BASE,	STATUS_START,	0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+	LAST_DESC
 };
 
-#define SIZE(x) (sizeof(x) / sizeof(x[0]))
-
-unsigned int __initdata io_desc_size = SIZE(io_desc);
+void __init nexuspci_map_io(void)
+{
+	iotable_init(nexuspci_io_desc);
+}