Merge ../linux-2.6-watchdog-mm

[pandora-kernel.git] / 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 *);
 
-void cn_queue_wrapper(void *data);
+void cn_queue_wrapper(struct work_struct *work);
 
 extern int cn_already_initialized;