projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'marvell/dt' into late2/dt
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
power
/
user.c
diff --git
a/kernel/power/user.c
b/kernel/power/user.c
index 91b0fd021a95d08eef106b3e0b86a41e3a135055..4ed81e74f86fbb2a9d7b0ab8e7d105d0944763c0 100644
(file)
--- a/
kernel/power/user.c
+++ b/
kernel/power/user.c
@@
-24,7
+24,6
@@
#include <linux/console.h>
#include <linux/cpu.h>
#include <linux/freezer.h>
-#include <scsi/scsi_scan.h>
#include <asm/uaccess.h>
@@
-84,7
+83,6
@@
static int snapshot_open(struct inode *inode, struct file *filp)
* appear.
*/
wait_for_device_probe();
- scsi_complete_async_scans();
data->swap = -1;
data->mode = O_WRONLY;