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 branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
include
/
linux
/
connector.h
diff --git
a/include/linux/connector.h
b/include/linux/connector.h
index 3ea1cd58de97fd7ccbba6f762f32dedca10014db..10eb56b2940ad8c8b7f6775de247d552a99cc6fe 100644
(file)
--- a/
include/linux/connector.h
+++ b/
include/linux/connector.h
@@
-133,7
+133,7
@@
struct cn_callback_data {
struct cn_callback_entry {
struct list_head callback_entry;
struct cn_callback *cb;
- struct
delayed_work
work;
+ struct
work_struct
work;
struct cn_queue_dev *pdev;
struct cn_callback_id id;