Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[pandora-kernel.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index e59af24..8646401 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -20,7 +20,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/initrd.h>
 #include <linux/bootmem.h>
 #include <linux/acpi.h>