diff options
author | Len Brown <len.brown@intel.com> | 2007-12-06 21:26:52 (GMT) |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-12-06 21:26:52 (GMT) |
commit | f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce (patch) | |
tree | 01a9683776b38bf82c136aebbff9ec2a62540a33 /arch/x86 | |
parent | ceaeee6ad6c2a24bf37d9f426414cf3007432352 (diff) | |
parent | 74d0f3338fbb3c69894968df1fedaf10c88cd0e4 (diff) | |
download | linux-fsl-qoriq-f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce.tar.xz |
Pull suspend-2.6.24 into release branch
Diffstat (limited to 'arch/x86')
-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 a97313b..1e931aa 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 |