From d7f98cd26bacb8bf4d753d6ba43582a686cea36a Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Thu, 17 Nov 2011 18:43:40 -0300
Subject: [PATCH] --- yaml --- r: 285312 b: refs/heads/master c:
 82c80f8371835f861bdbe50eefa5f49888d23210 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/media/video/vino.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6753bffbdd6c..428646272074 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68dd9dd4113a7d2bd329590091a3f97fee3fd659
+refs/heads/master: 82c80f8371835f861bdbe50eefa5f49888d23210
diff --git a/trunk/drivers/media/video/vino.c b/trunk/drivers/media/video/vino.c
index 52a0a3736c82..4d7391ec8001 100644
--- a/trunk/drivers/media/video/vino.c
+++ b/trunk/drivers/media/video/vino.c
@@ -708,7 +708,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
 		size, count);
 
 	/* allocate memory for table with virtual (page) addresses */
-	fb->desc_table.virtual = (unsigned long *)
+	fb->desc_table.virtual =
 		kmalloc(count * sizeof(unsigned long), GFP_KERNEL);
 	if (!fb->desc_table.virtual)
 		return -ENOMEM;