diff options
author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:46 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:46 +0000 |
commit | 14eec47753216e185396be5b0e6f04f274bfe4a5 (patch) | |
tree | a705958bc9a154684440ac1482d642b6d2cf4bd4 /sound/soc/samsung/s3c2412-i2s.c | |
parent | Merge remote-tracking branch 'asoc/topic/dapm-pin' into asoc-next (diff) | |
parent | ASoC: Drop SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag (diff) | |
download | wireguard-linux-14eec47753216e185396be5b0e6f04f274bfe4a5.tar.xz wireguard-linux-14eec47753216e185396be5b0e6f04f274bfe4a5.zip |
Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next
Diffstat (limited to 'sound/soc/samsung/s3c2412-i2s.c')
-rw-r--r-- | sound/soc/samsung/s3c2412-i2s.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 0a4718207e6e..6d0b8897fa6c 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -35,12 +35,10 @@ #include <linux/platform_data/asoc-s3c.h> static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_out = { - .chan_name = "tx", .addr_width = 4, }; static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_in = { - .chan_name = "rx", .addr_width = 4, }; |