git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[safe/jmp/linux-2.6]
/
include
/
linux
/
connector.h
diff --git
a/include/linux/connector.h
b/include/linux/connector.h
index
4c02119
..
10eb56b
100644
(file)
--- a/
include/linux/connector.h
+++ b/
include/linux/connector.h
@@
-170,7
+170,7
@@
void cn_queue_free_dev(struct cn_queue_dev *dev);
int cn_cb_equal(struct cb_id *, struct cb_id *);
int cn_cb_equal(struct cb_id *, struct cb_id *);
-void cn_queue_wrapper(
void *data
);
+void cn_queue_wrapper(
struct work_struct *work
);
extern int cn_already_initialized;
extern int cn_already_initialized;