From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 4 Aug 2013 19:22:03 +0000 (+0100)
Subject: ASoC: kirkwood: merge struct kirkwood_dma_priv with struct kirkwood_dma_data
X-Git-Tag: v3.12-rc1~150^2~9^2~40^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7d094297946e32da9bdf03cd5be1f6954d17ed3;p=pandora-kernel.git

ASoC: kirkwood: merge struct kirkwood_dma_priv with struct kirkwood_dma_data

Merge these two structures together; nothing other than the I2S and
DMA driver makes use of struct kirkwood_dma_data, and it's not like
struct kirkwood_dma_data is really just used to convey DMA specific
data to the backend; it's more a general shared structure between the
two halves.

This will later allow kirkwood-dma.c and kirkwood-i2s.c to be merged
together.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

Reading git-diff-tree failed