From 5fa876d0ab1f3615b177a67b38d7bb8fda5afb86 Mon Sep 17 00:00:00 2001
From: Zachary Amsden <zach@vmware.com>
Date: Sat, 30 Sep 2006 23:29:38 -0700
Subject: [PATCH] --- yaml --- r: 37741 b: refs/heads/master c:
 5a73fdc5ea836d2edc5e02890b51185fe304d7d3 h: refs/heads/master i:   37739:
 f68de696604f9bc497d6d7f3920cf0c1d12d169d v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/boot/video.S | 2 --
 trunk/arch/i386/kernel/nmi.c | 1 -
 trunk/arch/i386/lib/delay.c  | 1 -
 trunk/include/linux/unwind.h | 2 --
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b4d5413797c9..7c0fae8795d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 789e6ac0a7cbbb38402293256a295302fd8a1100
+refs/heads/master: 5a73fdc5ea836d2edc5e02890b51185fe304d7d3
diff --git a/trunk/arch/i386/boot/video.S b/trunk/arch/i386/boot/video.S
index 8c2a6faeeae5..2c5b5cc55f79 100644
--- a/trunk/arch/i386/boot/video.S
+++ b/trunk/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 --git a/trunk/arch/i386/kernel/nmi.c b/trunk/arch/i386/kernel/nmi.c
index 0fc4997fb143..3e8e3adb0489 100644
--- a/trunk/arch/i386/kernel/nmi.c
+++ b/trunk/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 --git a/trunk/arch/i386/lib/delay.c b/trunk/arch/i386/lib/delay.c
index 3c0714c4b669..f6edb11364df 100644
--- a/trunk/arch/i386/lib/delay.c
+++ b/trunk/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 --git a/trunk/include/linux/unwind.h b/trunk/include/linux/unwind.h
index ce48e2cd37a2..73e1751d03dd 100644
--- a/trunk/include/linux/unwind.h
+++ b/trunk/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