projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/users/willy/linux-nvme
[linux-2.6-block.git]
/
include
/
linux
/
nvme.h
diff --git
a/include/linux/nvme.h
b/include/linux/nvme.h
index b95431d0338bf21902316e30e2866781b1b750f4..a50173ca1d729aba84bc00c2572b40a91ec93140 100644
(file)
--- a/
include/linux/nvme.h
+++ b/
include/linux/nvme.h
@@
-92,6
+92,7
@@
struct nvme_dev {
struct list_head namespaces;
struct kref kref;
struct miscdevice miscdev;
+ work_func_t reset_workfn;
struct work_struct reset_work;
struct notifier_block nb;
char name[12];