diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:08 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:08 -0500 |
| commit | c088f4e9da74b901f7ed1749ad697d77622ed0f9 (patch) | |
| tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /drivers/acpi/reboot.c | |
| parent | ce79735c12d62c3cda38eb31762cf98e87c7b087 (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/reboot.c')
| -rw-r--r-- | drivers/acpi/reboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c index a6b662c00b67..93f91142d7ad 100644 --- a/drivers/acpi/reboot.c +++ b/drivers/acpi/reboot.c | |||
| @@ -42,7 +42,7 @@ void acpi_reboot(void) | |||
| 42 | case ACPI_ADR_SPACE_SYSTEM_MEMORY: | 42 | case ACPI_ADR_SPACE_SYSTEM_MEMORY: |
| 43 | case ACPI_ADR_SPACE_SYSTEM_IO: | 43 | case ACPI_ADR_SPACE_SYSTEM_IO: |
| 44 | printk(KERN_DEBUG "ACPI MEMORY or I/O RESET_REG.\n"); | 44 | printk(KERN_DEBUG "ACPI MEMORY or I/O RESET_REG.\n"); |
| 45 | acpi_hw_low_level_write(8, reset_value, rr); | 45 | acpi_reset(); |
| 46 | break; | 46 | break; |
| 47 | } | 47 | } |
| 48 | /* Wait ten seconds */ | 48 | /* Wait ten seconds */ |