aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-12-06 16:26:52 -0500
committerLen Brown <len.brown@intel.com>2007-12-06 16:26:52 -0500
commitf7a5274d7dde0022dedfb6bca5b4438bbf30e9ce (patch)
tree01a9683776b38bf82c136aebbff9ec2a62540a33 /arch
parentceaeee6ad6c2a24bf37d9f426414cf3007432352 (diff)
parent74d0f3338fbb3c69894968df1fedaf10c88cd0e4 (diff)
Pull suspend-2.6.24 into release branch
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/acpi/wakeup_32.S4
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