diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 17:14:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 17:14:16 -0500 |
| commit | f194d132e4971111f85c18c96067acffb13cee6d (patch) | |
| tree | e7510b0f2300e059db3fbe850b68667af28531f0 /arch | |
| parent | 09f3eca2b7e2762e223fdd359f9d0f6303a85f6c (diff) | |
| parent | 982286d1b8e438f595cdc9304cc4c185c7b90a39 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: suspend: old debugging hacks sneaked back
Freezer: Fix JFFS2 garbage collector freezing issue (rev. 2)
HWMON: coretemp, suspend fix
Freezer: Fix APM emulation breakage
Freezer: Fix s2disk resume from initrd
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_32.S | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index a97313b1270e..1e931aaf2ef6 100644 --- a/arch/x86/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S | |||
| @@ -35,10 +35,6 @@ wakeup_code: | |||
| 35 | wakeup_code_start = . | 35 | wakeup_code_start = . |
| 36 | .code16 | 36 | .code16 |
| 37 | 37 | ||
| 38 | movw $0xb800, %ax | ||
| 39 | movw %ax,%fs | ||
| 40 | movw $0x0e00 + 'L', %fs:(0x10) | ||
| 41 | |||
| 42 | cli | 38 | cli |
| 43 | cld | 39 | cld |
| 44 | 40 | ||