git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/misc' into for-linus
[pandora-kernel.git]
/
kernel
/
power
/
user.c
diff --git
a/kernel/power/user.c
b/kernel/power/user.c
index
ed97375
..
bf0014d
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>