From 65efea7e7a71452b2aa0b220097a7737aed0da05 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Wed, 19 Aug 2009 17:52:08 +0100
Subject: [PATCH] --- yaml --- r: 162495 b: refs/heads/master c:
 106a47ba0a4fcdfa62e7cd708a4284c03e4db05c h: refs/heads/master i:   162493:
 7992e33b9383fb71f59caec0a0e7ee9a16937000   162491:
 a078864cf3d2884bd04d04b994fd5a1e8919b891   162487:
 f2ff262b452f5ef4db647f1f657986fb1b41a713   162479:
 026fbe0e799b69b4967466e1a9c366cbb597c2d9   162463:
 d9edfb176f57bc80ec0c804988d893062ee2895a   162431:
 235c2090eee435fbc8e6ba27a803780daf783479 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/pohmelfs/config.c | 3 +--
 trunk/drivers/staging/pohmelfs/dir.c    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e08e658f7eca..4298effe41f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76efa5e34ed81587e26e483a624dc7f72efb389a
+refs/heads/master: 106a47ba0a4fcdfa62e7cd708a4284c03e4db05c
diff --git a/trunk/drivers/staging/pohmelfs/config.c b/trunk/drivers/staging/pohmelfs/config.c
index a6eaa42fb669..99ae1d9649a0 100644
--- a/trunk/drivers/staging/pohmelfs/config.c
+++ b/trunk/drivers/staging/pohmelfs/config.c
@@ -446,9 +446,8 @@ static int pohmelfs_cn_crypto(struct cn_msg *msg)
 	return err;
 }
 
-static void pohmelfs_cn_callback(void *data)
+static void pohmelfs_cn_callback(struct cn_msg *msg)
 {
-	struct cn_msg *msg = data;
 	int err;
 
 	switch (msg->flags) {
diff --git a/trunk/drivers/staging/pohmelfs/dir.c b/trunk/drivers/staging/pohmelfs/dir.c
index 4c58e22c1fbe..4c63a4cc1bd4 100644
--- a/trunk/drivers/staging/pohmelfs/dir.c
+++ b/trunk/drivers/staging/pohmelfs/dir.c
@@ -412,7 +412,7 @@ static int pohmelfs_readdir(struct file *file, void *dirent, filldir_t filldir)
 				__func__, file->f_pos, pi->ino, n->data, n->len,
 				n->ino, n->mode, mode, file->f_pos, n->hash);
 
-		file->private_data = (void *)n->hash;
+		file->private_data = (void *)(unsigned long)n->hash;
 
 		len = n->len;
 		err = filldir(dirent, n->data, n->len, file->f_pos, n->ino, mode);