diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-08 03:31:22 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-08 03:31:22 -0400 |
| commit | d95300758bed9e0f783f3e3b4fd037bf0a21abe0 (patch) | |
| tree | 994823b6e0b88597eded79f9eeb0f44b580c89e5 /include/linux/connector.h | |
| parent | e12669e774be403c84baa651306d305752a35cd8 (diff) | |
| parent | 829841146878e082613a49581ae252c071057c23 (diff) | |
Merge branch 'master'
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); |