diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-05 08:42:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-05 08:42:45 +0200 |
| commit | a1716d508abf77e4bd02c275ab9293b9866929f3 (patch) | |
| tree | 57195a0cfc8bdc353f163a8b3b53c8d99c2562e8 /drivers | |
| parent | 64e83b5a919a65eb35b63dd7e07c188379ff8ce6 (diff) | |
| parent | 4b4f7280d7fd1feeff134c2cf2db32fd583b6c29 (diff) | |
Merge branch 'x86/s2ram-fix' into x86/urgent
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/sleep/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index c3b0cd88d09..495c63a3e0a 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -36,9 +36,8 @@ static int acpi_sleep_prepare(u32 acpi_state) if (!acpi_wakeup_address) { return -EFAULT; } - acpi_set_firmware_waking_vector((acpi_physical_address) - virt_to_phys((void *) - acpi_wakeup_address)); + acpi_set_firmware_waking_vector( + (acpi_physical_address)acpi_wakeup_address); } ACPI_FLUSH_CPU_CACHE(); |