patch-2.1.73 linux/arch/mips/jazz/setup.c

Next file: linux/arch/mips/kernel/Makefile
Previous file: linux/arch/mips/jazz/jazzdma.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.72/linux/arch/mips/jazz/setup.c linux/arch/mips/jazz/setup.c
@@ -6,12 +6,13 @@
  * for more details.
  *
  * Copyright (C) 1996, 1997 by Ralf Baechle
+ *
+ * $Id: setup.c,v 1.5 1997/12/02 05:51:05 ralf Exp $
  */
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
-#include <linux/mm.h>
 #include <asm/bootinfo.h>
 #include <asm/keyboard.h>
 #include <asm/irq.h>
@@ -20,7 +21,6 @@
 #include <asm/reboot.h>
 #include <asm/vector.h>
 #include <asm/io.h>
-#include <asm/pgtable.h>
 
 /*
  * Initial irq handlers.
@@ -98,15 +98,15 @@
 	}
     }
 
-        add_wired_entry (0x02000017, 0x03c00017, 0xe0000000, PM_64K);
-        add_wired_entry (0x02400017, 0x02440017, 0xe2000000, PM_16M);
-        add_wired_entry (0x01800017, 0x01000017, 0xe4000000, PM_4M);
+	add_wired_entry (0x02000017, 0x03c00017, 0xe0000000, PM_64K);
+	add_wired_entry (0x02400017, 0x02440017, 0xe2000000, PM_16M);
+	add_wired_entry (0x01800017, 0x01000017, 0xe4000000, PM_4M);
 
 	irq_setup = jazz_irq_setup;
 	fd_cacheflush = jazz_fd_cacheflush;
 	keyboard_setup = jazz_keyboard_setup;
 	feature = &jazz_feature;			// Will go away
-	port_base = JAZZ_PORT_BASE;
+	mips_io_port_base = JAZZ_PORT_BASE;
 	isa_slot_offset = 0xe3000000;
 	request_region(0x00,0x20,"dma1");
 	request_region(0x40,0x20,"timer");

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov