Merge branch 'master' into 85xx

[linux-2.6-omap-h63xx.git] / arch / i386 / lib / delay.c

diff --git a/arch/i386/lib/delay.c b/arch/i386/lib/delay.c
index 3c0714c4b6691aaa7e256cce82262603cc82276c..f6edb11364dfe5edef9ffac33341b24307a85434 100644 (file)
--- a/arch/i386/lib/delay.c
+++ b/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>