diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-10 16:27:20 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-10 16:27:20 +0800 |
| commit | 14839768c2e0f5448f1767729a7fe5791cd4f3dd (patch) | |
| tree | 9f69e695154d828ca8f6e81d76451843f9d543f4 /drivers/dma | |
| parent | 76b225cc90ecdd50e67c4bdb79448973db49ead6 (diff) | |
| parent | f588fca89c529c559ef280a96b4c9143aec904bc (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 3d0612eab0c2..e93c4ea1a1a8 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -760,7 +760,6 @@ static int sdma_set_chan_private_data(struct sdma_channel *sdmac) static int sdma_config_channel(struct sdma_channel *sdmac) { int ret; - struct imx_dma_data *data = sdmac->chan.private; sdma_disable_channel(sdmac); |