diff options
Diffstat (limited to 'kernel/power/hibernate.c')
-rw-r--r-- | kernel/power/hibernate.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 8b53db38a279..238025f5472e 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/syscore_ops.h> | 27 | #include <linux/syscore_ops.h> |
28 | #include <linux/ctype.h> | 28 | #include <linux/ctype.h> |
29 | #include <linux/genhd.h> | 29 | #include <linux/genhd.h> |
30 | #include <scsi/scsi_scan.h> | ||
31 | 30 | ||
32 | #include "power.h" | 31 | #include "power.h" |
33 | 32 | ||
@@ -748,13 +747,6 @@ static int software_resume(void) | |||
748 | async_synchronize_full(); | 747 | async_synchronize_full(); |
749 | } | 748 | } |
750 | 749 | ||
751 | /* | ||
752 | * We can't depend on SCSI devices being available after loading | ||
753 | * one of their modules until scsi_complete_async_scans() is | ||
754 | * called and the resume device usually is a SCSI one. | ||
755 | */ | ||
756 | scsi_complete_async_scans(); | ||
757 | |||
758 | swsusp_resume_device = name_to_dev_t(resume_file); | 750 | swsusp_resume_device = name_to_dev_t(resume_file); |
759 | if (!swsusp_resume_device) { | 751 | if (!swsusp_resume_device) { |
760 | error = -ENODEV; | 752 | error = -ENODEV; |