Merge branch 'master' of /home/sam/kernel/linux-2.6/

[powerpc.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 95b7fe1..39ae24d 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -26,7 +26,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/interrupt.h>                   /* For in_interrupt() */
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/smp.h>
 #include <linux/security.h>