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

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

diff -u --recursive --new-file v2.1.100/linux/arch/mips/jazz/setup.c linux/arch/mips/jazz/setup.c
@@ -1,5 +1,5 @@
 /*
- * Setup pointers to hardware dependand routines.
+ * Setup pointers to hardware dependant routines.
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -7,20 +7,25 @@
  *
  * Copyright (C) 1996, 1997 by Ralf Baechle
  *
- * $Id: setup.c,v 1.5 1997/12/02 05:51:05 ralf Exp $
+ * $Id: setup.c,v 1.6 1998/05/04 09:17:45 ralf Exp $
  */
+#include <linux/config.h>
+#include <linux/hdreg.h>
 #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/ide.h>
 #include <asm/irq.h>
 #include <asm/jazz.h>
 #include <asm/ptrace.h>
 #include <asm/reboot.h>
 #include <asm/vector.h>
 #include <asm/io.h>
+#include <asm/pgtable.h>
 
 /*
  * Initial irq handlers.
@@ -41,6 +46,8 @@
 extern void jazz_machine_halt(void);
 extern void jazz_machine_power_off(void);
 
+extern struct ide_ops std_ide_ops;
+
 void (*board_time_init)(struct irqaction *irq);
 
 __initfunc(static void jazz_time_init(struct irqaction *irq))
@@ -118,4 +125,8 @@
 	_machine_restart = jazz_machine_restart;
 	_machine_halt = jazz_machine_halt;
 	_machine_power_off = jazz_machine_power_off;
+
+#ifdef CONFIG_BLK_DEV_IDE
+	ide_ops = &std_ide_ops;
+#endif
 }

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