From de6154b4475bb3d115726ed552ac69f97b707dad Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 9 Aug 2010 10:29:28 -0400
Subject: [PATCH] --- yaml --- r: 210303 b: refs/heads/master c:
 50b6e71ae83714be509b80727dbf90fa8b1c0717 h: refs/heads/master i:   210301:
 84e083a69a000bdf821d414ffcf9e2d82318d7ba   210299:
 9805b22b4cf6fe3a9901c58ce2f8ff54397bab6e   210295:
 8b94eda93401471792ca0df9bdb3f3ea5a3d0c5f   210287:
 ea62be3f57069b4209722f0c95f5af54ff72cd4d   210271:
 f9009b998f080530e29e39cf52c46c1ac31f67ac   210239:
 f17f6d3d6d72d2d415d6b1ac32e2392ed9e53a14   210175:
 1df5364ba0ccc5cbe1f2fdd5be4752fdfa02f834 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/char/hw_random/n2-drv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 76448585f891..4152774e1fc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00ca28a507b215dcd121735f16764ea4173c4ff9
+refs/heads/master: 50b6e71ae83714be509b80727dbf90fa8b1c0717
diff --git a/trunk/drivers/char/hw_random/n2-drv.c b/trunk/drivers/char/hw_random/n2-drv.c
index 7a4f080f8356..d8a4ca87987d 100644
--- a/trunk/drivers/char/hw_random/n2-drv.c
+++ b/trunk/drivers/char/hw_random/n2-drv.c
@@ -387,7 +387,7 @@ static int n2rng_init_control(struct n2rng *np)
 
 static int n2rng_data_read(struct hwrng *rng, u32 *data)
 {
-	struct n2rng *np = rng->priv;
+	struct n2rng *np = (struct n2rng *) rng->priv;
 	unsigned long ra = __pa(&np->test_data);
 	int len;