diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /arch/x86/kernel/acpi/wakeup_32.S | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/x86/kernel/acpi/wakeup_32.S')
| -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 | ||