git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ata-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...
[sfrench/cifs-2.6.git]
/
include
/
linux
/
libata.h
diff --git
a/include/linux/libata.h
b/include/linux/libata.h
index bc756f8586f360abab00de2692feaaaa1591eea4..b19c6028221dd8dfddedd05163d2f1e8d1648ace 100644
(file)
--- a/
include/linux/libata.h
+++ b/
include/linux/libata.h
@@
-836,7
+836,7
@@
struct ata_port {
struct mutex scsi_scan_mutex;
struct delayed_work hotplug_task;
- struct
work_struct
scsi_rescan_task;
+ struct
delayed_work
scsi_rescan_task;
unsigned int hsm_task_state;