Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / arch / i386 / boot / setup.S

diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S
index ca668d9df16411c29d2928d230c32b99a129104f..0a5a3be6d69cbb08ae4b752c938ca97e83e14321 100644 (file)
--- a/arch/i386/boot/setup.S
+++ b/arch/i386/boot/setup.S
@@ -46,7 +46,6 @@
  * by Robert Schwebel, December 2001 <robert@schwebel.de>
  */
 
-#include <linux/config.h>
 #include <asm/segment.h>
 #include <linux/version.h>
 #include <linux/compile.h>