From 19c9bba94152148523ba0f7ef7cffe3d45656b11 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 29 Apr 1997 21:13:14 +0000
Subject: Import of Linux/MIPS 2.1.36

---
 arch/mips/kernel/setup.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'arch/mips/kernel/setup.c')

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 48de5d21a..2e2b074f9 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -23,13 +23,16 @@
 #ifdef CONFIG_BLK_DEV_RAM
 #include <linux/blk.h>
 #endif
+#ifdef CONFIG_RTC
+#include <linux/ioport.h>
+#include <linux/timex.h>
+#endif
 
 #include <asm/asm.h>
 #include <asm/bootinfo.h>
 #include <asm/cachectl.h>
 #include <asm/io.h>
 #include <asm/vector.h>
-#include <asm/segment.h>
 #include <asm/stackframe.h>
 #include <asm/system.h>
 #ifdef CONFIG_SGI
@@ -62,11 +65,6 @@ char wait_available;
  */
 int EISA_bus = 0;
 
-/*
- * Do a hardware reset.
- */
-void (*hard_reset_now)(void);
-
 /*
  * Milo passes some information to the kernel that looks like as if it
  * had been returned by a Intel PC BIOS.  Milo doesn't fill the passed
-- 
cgit v1.2.3