From 8170734123e757d48f8aad911b633443b5b0fe58 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Wed, 28 Dec 2011 16:05:22 +0800
Subject: [PATCH] --- yaml --- r: 284024 b: refs/heads/master c:
 d4d9820b4ad6d6227cad090a9f695eea37814215 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/sound/soc/kirkwood/kirkwood-i2s.c | 3 +--
 trunk/sound/soc/kirkwood/kirkwood.h     | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index aa8422a015a3..ac4bb9cfd2e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ab7e71a9cbcd31f5ee09da384bcfcf0fa11b8c9
+refs/heads/master: d4d9820b4ad6d6227cad090a9f695eea37814215
diff --git a/trunk/sound/soc/kirkwood/kirkwood-i2s.c b/trunk/sound/soc/kirkwood/kirkwood-i2s.c
index f6bb21156876..3cb9aa4299d3 100644
--- a/trunk/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/trunk/sound/soc/kirkwood/kirkwood-i2s.c
@@ -441,13 +441,12 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
 		goto err_ioremap;
 	}
 
-	if (!data || !data->dram) {
+	if (!data) {
 		dev_err(&pdev->dev, "no platform data ?!\n");
 		err = -EINVAL;
 		goto err_ioremap;
 	}
 
-	priv->dram = data->dram;
 	priv->burst = data->burst;
 
 	return snd_soc_register_dai(&pdev->dev, &kirkwood_i2s_dai);
diff --git a/trunk/sound/soc/kirkwood/kirkwood.h b/trunk/sound/soc/kirkwood/kirkwood.h
index bb6e6a5648c9..9047436b3937 100644
--- a/trunk/sound/soc/kirkwood/kirkwood.h
+++ b/trunk/sound/soc/kirkwood/kirkwood.h
@@ -123,7 +123,6 @@ struct kirkwood_dma_data {
 	void __iomem *io;
 	int irq;
 	int burst;
-	struct mbus_dram_target_info *dram;
 };
 
 #endif