Merge branch 'for-2.6.32' of git://git.kernel.dk/linux-2.6-block

[linux-2.6.git] / drivers / staging / dst / dcore.c

diff --git a/drivers/staging/dst/dcore.c b/drivers/staging/dst/dcore.c
index b1c258ca21023140f5e8a965ebc57c8b83d1e93d..ac8577358ba096126b38106e25c58d1268c25c37 100644 (file)
--- a/drivers/staging/dst/dcore.c
+++ b/drivers/staging/dst/dcore.c
@@ -847,10 +847,9 @@ static dst_command_func dst_commands[] = {
 /*
  * Configuration parser.
  */
-static void cn_dst_callback(void *data)
+static void cn_dst_callback(struct cn_msg *msg)
 {
        struct dst_ctl *ctl;
-       struct cn_msg *msg = data;
        int err;
        struct dst_ctl_ack ack;
        struct dst_node *n = NULL, *tmp;