patch-2.3.48 linux/arch/mips/sgi/kernel/reset.c

• Lines: 44
• Date: Thu Feb 24 22:52:30 2000
• Orig file: v2.3.47/linux/arch/mips/sgi/kernel/reset.c
• Orig date: Fri Jun 25 17:40:13 1999

diff -u --recursive --new-file v2.3.47/linux/arch/mips/sgi/kernel/reset.c linux/arch/mips/sgi/kernel/reset.c
@@ -1,4 +1,4 @@
-/* $Id: reset.c,v 1.6 1999/04/10 12:21:30 ulfc Exp $
+/* $Id: reset.c,v 1.8 1999/10/21 00:23:05 ralf Exp $
  *
  * Reset a SGI.
  *
@@ -17,8 +17,8 @@
 #include <asm/system.h>
 #include <asm/reboot.h>
 #include <asm/sgialib.h>
-#include <asm/sgihpc.h>
-#include <asm/sgint23.h>
+#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/sgint23.h>
 
 /*
  * Just powerdown if init hasn't done after POWERDOWN_TIMEOUT seconds.
@@ -108,7 +108,7 @@
 	if (has_paniced)
 		prom_reboot();
 
-	enable_irq(9);
+	enable_irq(SGI_PANEL_IRQ);
 }
 
 static inline void power_button(void)
@@ -185,7 +185,7 @@
 	hpc3mregs->panel = 3; /* power_interrupt | power_supply_on */
 
 	if (ioc_icontrol->istat1 & 2) { /* Wait until interrupt goes away */
-		disable_irq(9);
+		disable_irq(SGI_PANEL_IRQ);
 		init_timer(&debounce_timer);
 		debounce_timer.function = debounce;
 		debounce_timer.expires = jiffies + 5;
@@ -239,7 +239,7 @@
 	_machine_halt = sgi_machine_halt;
 	_machine_power_off = sgi_machine_power_off;
 
-	request_irq(9, panel_int, 0, "Front Panel", NULL);
+	request_irq(SGI_PANEL_IRQ, panel_int, 0, "Front Panel", NULL);
 	init_timer(&blink_timer);
 	blink_timer.function = blink_timeout;
 	notifier_chain_register(&panic_notifier_list, &panic_block);