diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 09:44:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 09:44:07 -0400 |
| commit | f58f8be7f65312f602f7970e7da47a6413e692b0 (patch) | |
| tree | f60cc040deebceea1b44082dc713e95687d8527f /include/linux/connector.h | |
| parent | c71c18576d0d8aa4db876c737c3c597c724cf02f (diff) | |
| parent | e710245bb0f980adfb1dfe850e43761a8117c6be (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/connector.h')
| -rw-r--r-- | include/linux/connector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h index 86d4b0a81713..96582c9911ac 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
| @@ -149,7 +149,7 @@ struct cn_dev { | |||
| 149 | 149 | ||
| 150 | int cn_add_callback(struct cb_id *, char *, void (*callback) (void *)); | 150 | int cn_add_callback(struct cb_id *, char *, void (*callback) (void *)); |
| 151 | void cn_del_callback(struct cb_id *); | 151 | void cn_del_callback(struct cb_id *); |
| 152 | int cn_netlink_send(struct cn_msg *, u32, int); | 152 | int cn_netlink_send(struct cn_msg *, u32, unsigned int __nocast); |
| 153 | 153 | ||
| 154 | int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(void *)); | 154 | int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(void *)); |
| 155 | void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id); | 155 | void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id); |