Merge branch 'core/header-fixes' into x86/headers
Ingo Molnar [Fri, 13 Feb 2009 20:05:03 +0000 (21:05 +0100)]
Conflicts:
arch/x86/include/asm/setup.h

1  2 
arch/x86/include/asm/setup.h
arch/x86/include/asm/syscalls.h

@@@ -48,14 -31,10 +33,8 @@@ struct x86_quirks 
        int (*update_genapic)(void);
  };
  
- extern struct x86_quirks *x86_quirks;
- extern unsigned long saved_video_mode;
- #ifndef CONFIG_PARAVIRT
- #define paravirt_post_allocator_init()        do {} while (0)
- #endif
  #endif /* __ASSEMBLY__ */
  
 -#ifdef __KERNEL__
 -
  #ifdef __i386__
  
  #include <linux/pfn.h>
Simple merge