From: Zachary Amsden <zach@vmware.com>

During tracking down a PAE compile failure, I found that config.h was being
included in a bunch of places in i386 code.  It is no longer necessary, so
drop it.

Signed-off-by: Zachary Amsden <zach@vmware.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/boot/video.S |    2 --
 arch/i386/kernel/nmi.c |    1 -
 arch/i386/lib/delay.c  |    1 -
 include/linux/unwind.h |    2 --
 4 files changed, 6 deletions(-)

diff -puN arch/i386/boot/video.S~paravirt-pae-compile-fix arch/i386/boot/video.S
--- a/arch/i386/boot/video.S~paravirt-pae-compile-fix
+++ a/arch/i386/boot/video.S
@@ -11,8 +11,6 @@
  *
  */
 
-#include <linux/config.h> /* for CONFIG_VIDEO_* */
-
 /* Enable autodetection of SVGA adapters and modes. */
 #undef CONFIG_VIDEO_SVGA
 
diff -puN arch/i386/kernel/nmi.c~paravirt-pae-compile-fix arch/i386/kernel/nmi.c
--- a/arch/i386/kernel/nmi.c~paravirt-pae-compile-fix
+++ a/arch/i386/kernel/nmi.c
@@ -13,7 +13,6 @@
  *  Mikael Pettersson	: PM converted to driver model. Disable/enable API.
  */
 
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
diff -puN arch/i386/lib/delay.c~paravirt-pae-compile-fix arch/i386/lib/delay.c
--- a/arch/i386/lib/delay.c~paravirt-pae-compile-fix
+++ a/arch/i386/lib/delay.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/delay.h>
 
diff -puN include/linux/unwind.h~paravirt-pae-compile-fix include/linux/unwind.h
--- a/include/linux/unwind.h~paravirt-pae-compile-fix
+++ a/include/linux/unwind.h
@@ -12,8 +12,6 @@
  * is not much point in implementing the full Dwarf2 unwind API.
  */
 
-#include <linux/config.h>
-
 struct module;
 
 #ifdef CONFIG_STACK_UNWIND
_