diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-22 02:27:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-22 02:27:40 -0400 |
| commit | f79e3185dd0f8650022518d7624c876d8929061b (patch) | |
| tree | 4cec3a434036031b4e2d4fef608f5523fb21c829 /drivers/acpi/sleep | |
| parent | e8b495fe09bc793ae26774e7b2667f7f658d56e2 (diff) | |
| parent | 8b8eb7d8cfc6cd95ed00cd58754e8493322505bd (diff) | |
Pull misc into release branch
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'drivers/acpi/sleep')
| -rw-r--r-- | drivers/acpi/sleep/main.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 42127c0d612c..3279e72a94f8 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
| @@ -210,11 +210,6 @@ static void acpi_hibernation_finish(void) | |||
| 210 | 210 | ||
| 211 | /* reset firmware waking vector */ | 211 | /* reset firmware waking vector */ |
| 212 | acpi_set_firmware_waking_vector((acpi_physical_address) 0); | 212 | acpi_set_firmware_waking_vector((acpi_physical_address) 0); |
| 213 | |||
| 214 | if (init_8259A_after_S1) { | ||
| 215 | printk("Broken toshiba laptop -> kicking interrupts\n"); | ||
| 216 | init_8259A(0); | ||
| 217 | } | ||
| 218 | } | 213 | } |
| 219 | 214 | ||
| 220 | static int acpi_hibernation_pre_restore(void) | 215 | static int acpi_hibernation_pre_restore(void) |