From 019d706b80c4c47c889e1cf010315156b01f37ce Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@radix.net>
Date: Mon, 7 Sep 2009 14:32:45 -0300
Subject: [PATCH] --- yaml --- r: 164108 b: refs/heads/master c:
 958411bc484d15c3c3f7579b84b57d3b9d80ff21 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index eda641911b65..425253fd3bb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e12e1536c1b8aaef9baeed09a8f81da393fcba6
+refs/heads/master: 958411bc484d15c3c3f7579b84b57d3b9d80ff21
diff --git a/trunk/drivers/media/video/cx18/cx18-i2c.c b/trunk/drivers/media/video/cx18/cx18-i2c.c
index da395fef50df..dbbf93d2eee0 100644
--- a/trunk/drivers/media/video/cx18/cx18-i2c.c
+++ b/trunk/drivers/media/video/cx18/cx18-i2c.c
@@ -116,7 +116,7 @@ static int cx18_i2c_new_ir(struct i2c_adapter *adap, u32 hw, const char *type,
 	/* Our default information for ir-kbd-i2c.c to use */
 	switch (hw) {
 	case CX18_HW_Z8F0811_IR_RX_HAUP:
-		info.platform_data = &z8f0811_ir_init_data;
+		info.platform_data = (void *) &z8f0811_ir_init_data;
 		break;
 	default:
 		break;