From db3c26fc7ff0f799cd6588424e78be9cf1d2b249 Mon Sep 17 00:00:00 2001
From: Timur Tabi <timur@freescale.com>
Date: Wed, 14 Nov 2007 12:07:58 +0100
Subject: [PATCH] --- yaml --- r: 73917 b: refs/heads/master c:
 4df20535ec52fb7eba604eb1ba77148f92ab8edd h: refs/heads/master i:   73915:
 70bf0cbb23bb75adc476acd4beb6d432e1ca4f61 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/cs4270.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c9d82e1fd219..5c120e8980c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37435446244958edc36b33cf2b87c2f5cd433ba4
+refs/heads/master: 4df20535ec52fb7eba604eb1ba77148f92ab8edd
diff --git a/trunk/sound/soc/codecs/cs4270.c b/trunk/sound/soc/codecs/cs4270.c
index 5d601ad6da70..abac62866da8 100644
--- a/trunk/sound/soc/codecs/cs4270.c
+++ b/trunk/sound/soc/codecs/cs4270.c
@@ -725,7 +725,8 @@ static int cs4270_probe(struct platform_device *pdev)
 	codec->owner = THIS_MODULE;
 	codec->dai = &cs4270_dai;
 	codec->num_dai = 1;
-	codec->private_data = codec + ALIGN(sizeof(struct snd_soc_codec), 4);
+	codec->private_data = (void *) codec +
+		ALIGN(sizeof(struct snd_soc_codec), 4);
 
 	socdev->codec = codec;