Merge branches 'release', 'misc' and 'misc-2.6.25' into release

[linux-2.6-omap-h63xx.git] / include / asm-x86 / suspend_32.h

diff --git a/include/asm-x86/suspend_32.h b/include/asm-x86/suspend_32.h
index a2520732ffd6a30b8f769f7a053c31c505944eaf..1bbda3ad7796002f40c52df81a02053b2f1a875d 100644 (file)
--- a/include/asm-x86/suspend_32.h
+++ b/include/asm-x86/suspend_32.h
@@ -12,8 +12,8 @@ static inline int arch_prepare_suspend(void) { return 0; }
 struct saved_context {
        u16 es, fs, gs, ss;
        unsigned long cr0, cr2, cr3, cr4;
-       struct Xgt_desc_struct gdt;
-       struct Xgt_desc_struct idt;
+       struct desc_ptr gdt;
+       struct desc_ptr idt;
        u16 ldt;
        u16 tss;
        unsigned long tr;