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

[karo-tx-linux.git] / kernel / power / user.c

diff --git a/kernel/power/user.c b/kernel/power/user.c
index ed97375daae9326ecf2b4864ff9368f1491f642a..bf0014d6a5f0972a1b2352d35a09eb82296164d1 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -23,7 +23,6 @@
 #include <linux/console.h>
 #include <linux/cpu.h>
 #include <linux/freezer.h>
-#include <linux/smp_lock.h>
 #include <scsi/scsi_scan.h>
 
 #include <asm/uaccess.h>