diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/mips/sgi-ip22/ip22-hpc.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-hpc.c')
| -rw-r--r-- | arch/mips/sgi-ip22/ip22-hpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip22/ip22-hpc.c b/arch/mips/sgi-ip22/ip22-hpc.c index c0afeccb08c4..5c00cdd20d8e 100644 --- a/arch/mips/sgi-ip22/ip22-hpc.c +++ b/arch/mips/sgi-ip22/ip22-hpc.c | |||
| @@ -49,7 +49,7 @@ void __init sgihpc_init(void) | |||
| 49 | sgint = &sgioc->int3; | 49 | sgint = &sgioc->int3; |
| 50 | system_type = "SGI Indy"; | 50 | system_type = "SGI Indy"; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | sgi_ioc_reset = (SGIOC_RESET_PPORT | SGIOC_RESET_KBDMOUSE | | 53 | sgi_ioc_reset = (SGIOC_RESET_PPORT | SGIOC_RESET_KBDMOUSE | |
| 54 | SGIOC_RESET_EISA | SGIOC_RESET_ISDN | | 54 | SGIOC_RESET_EISA | SGIOC_RESET_ISDN | |
| 55 | SGIOC_RESET_LC0OFF); | 55 | SGIOC_RESET_LC0OFF); |