diff options
| author | Len Brown <len.brown@intel.com> | 2007-12-06 22:26:52 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-12-06 22:26:52 +0100 |
| commit | f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce (patch) | |
| tree | 01a9683776b38bf82c136aebbff9ec2a62540a33 /arch | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | ACPI: suspend: old debugging hacks sneaked back (diff) | |
| download | linux-f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce.tar.xz linux-f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce.zip | |
Pull suspend-2.6.24 into release branch
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: wakeup_code_start = . .code16 - movw $0xb800, %ax - movw %ax,%fs - movw $0x0e00 + 'L', %fs:(0x10) - cli cld |