diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-20 04:38:03 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-20 04:38:03 -0500 |
| commit | d378aca6ec708bfb24df5c47801b1f2399efc481 (patch) | |
| tree | 7535f96bf34314df071698d2e06054b8d5223ebb /arch/mips/arc/misc.c | |
| parent | abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/arc/misc.c')
| -rw-r--r-- | arch/mips/arc/misc.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/mips/arc/misc.c b/arch/mips/arc/misc.c index 84867de22028..b2e10b9e9452 100644 --- a/arch/mips/arc/misc.c +++ b/arch/mips/arc/misc.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) | 9 | * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) |
| 10 | * Copyright (C) 1999 Silicon Graphics, Inc. | 10 | * Copyright (C) 1999 Silicon Graphics, Inc. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | 14 | ||
| @@ -20,17 +19,11 @@ | |||
| 20 | #include <asm/bootinfo.h> | 19 | #include <asm/bootinfo.h> |
| 21 | #include <asm/system.h> | 20 | #include <asm/system.h> |
| 22 | 21 | ||
| 23 | extern void *sgiwd93_host; | ||
| 24 | extern void reset_wd33c93(void *instance); | ||
| 25 | |||
| 26 | VOID | 22 | VOID |
| 27 | ArcHalt(VOID) | 23 | ArcHalt(VOID) |
| 28 | { | 24 | { |
| 29 | bc_disable(); | 25 | bc_disable(); |
| 30 | local_irq_disable(); | 26 | local_irq_disable(); |
| 31 | #ifdef CONFIG_SCSI_SGIWD93 | ||
| 32 | reset_wd33c93(sgiwd93_host); | ||
| 33 | #endif | ||
| 34 | ARC_CALL0(halt); | 27 | ARC_CALL0(halt); |
| 35 | never: goto never; | 28 | never: goto never; |
| 36 | } | 29 | } |
| @@ -40,9 +33,6 @@ ArcPowerDown(VOID) | |||
| 40 | { | 33 | { |
| 41 | bc_disable(); | 34 | bc_disable(); |
| 42 | local_irq_disable(); | 35 | local_irq_disable(); |
| 43 | #ifdef CONFIG_SCSI_SGIWD93 | ||
| 44 | reset_wd33c93(sgiwd93_host); | ||
| 45 | #endif | ||
| 46 | ARC_CALL0(pdown); | 36 | ARC_CALL0(pdown); |
| 47 | never: goto never; | 37 | never: goto never; |
| 48 | } | 38 | } |
| @@ -53,9 +43,6 @@ ArcRestart(VOID) | |||
| 53 | { | 43 | { |
| 54 | bc_disable(); | 44 | bc_disable(); |
| 55 | local_irq_disable(); | 45 | local_irq_disable(); |
| 56 | #ifdef CONFIG_SCSI_SGIWD93 | ||
| 57 | reset_wd33c93(sgiwd93_host); | ||
| 58 | #endif | ||
| 59 | ARC_CALL0(restart); | 46 | ARC_CALL0(restart); |
| 60 | never: goto never; | 47 | never: goto never; |
| 61 | } | 48 | } |
| @@ -65,9 +52,6 @@ ArcReboot(VOID) | |||
| 65 | { | 52 | { |
| 66 | bc_disable(); | 53 | bc_disable(); |
| 67 | local_irq_disable(); | 54 | local_irq_disable(); |
| 68 | #ifdef CONFIG_SCSI_SGIWD93 | ||
| 69 | reset_wd33c93(sgiwd93_host); | ||
| 70 | #endif | ||
| 71 | ARC_CALL0(reboot); | 55 | ARC_CALL0(reboot); |
| 72 | never: goto never; | 56 | never: goto never; |
| 73 | } | 57 | } |
| @@ -77,9 +61,6 @@ ArcEnterInteractiveMode(VOID) | |||
| 77 | { | 61 | { |
| 78 | bc_disable(); | 62 | bc_disable(); |
| 79 | local_irq_disable(); | 63 | local_irq_disable(); |
| 80 | #ifdef CONFIG_SCSI_SGIWD93 | ||
| 81 | reset_wd33c93(sgiwd93_host); | ||
| 82 | #endif | ||
| 83 | ARC_CALL0(imode); | 64 | ARC_CALL0(imode); |
| 84 | never: goto never; | 65 | never: goto never; |
| 85 | } | 66 | } |
