From 11da0cdd67b55f5c8fe0311f862efa5d16a155a1 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 31 Jan 2011 10:19:53 +0100
Subject: [PATCH] --- yaml --- r: 233292 b: refs/heads/master c:
 7a0e9b2557902bdca563a5eb1bbac87560bd7d20 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/dma/imx-sdma.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b3dfbdb7ea63..cc09fb5fdfee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fa81c270da4d8dffa84fcca448654a10ed0a5dc
+refs/heads/master: 7a0e9b2557902bdca563a5eb1bbac87560bd7d20
diff --git a/trunk/drivers/dma/imx-sdma.c b/trunk/drivers/dma/imx-sdma.c
index 8707723e36da..3e848ee9a18a 100644
--- a/trunk/drivers/dma/imx-sdma.c
+++ b/trunk/drivers/dma/imx-sdma.c
@@ -1307,7 +1307,6 @@ static int __init sdma_probe(struct platform_device *pdev)
 		dma_cap_set(DMA_CYCLIC, sdma->dma_device.cap_mask);
 
 		sdmac->chan.device = &sdma->dma_device;
-		sdmac->chan.chan_id = i;
 		sdmac->channel = i;
 
 		/* Add the channel to the DMAC list */