Merge branch 'x86/urgent' into core/percpu

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

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 373d3f628d245f280c407ebaf5f278cf4df6c5ad..9763eb700138a5d42a9d409dfd29b4a8b7362d60 100644 (file)
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -353,7 +353,7 @@ struct i387_soft_struct {
        u8                      no_update;
        u8                      rm;
        u8                      alimit;
-       struct info             *info;
+       struct math_emu_info    *info;
        u32                     entry_eip;
 };