From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 13 Feb 2009 20:05:03 +0000 (+0100)
Subject: Merge branch 'core/header-fixes' into x86/headers
X-Git-Tag: v2.6.30-rc1~211^2~26^2~2^4
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=22796b15725488002437ebbf98a22fdbe596cf89

Merge branch 'core/header-fixes' into x86/headers

Conflicts:
	arch/x86/include/asm/setup.h
---

22796b15725488002437ebbf98a22fdbe596cf89
diff --cc arch/x86/include/asm/setup.h
index 45b40278b582,5a3a13715756..c230189462a2
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.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>