diff options
author | Mark Brown <broonie@kernel.org> | 2020-01-23 12:36:45 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-01-23 12:36:45 +0000 |
commit | a7196caf83ea9e9b56c5c8c95fbfe0d45acec46b (patch) | |
tree | d9147ac16e1af83463bad4e45b233bc8e51f2e0e /sound/soc/samsung/idma.c | |
parent | 20230620b44510ce968a719a1d6ee7483583178d (diff) | |
parent | d8e2e0d2491e78f3f7b451c3a93ba29950efe2cf (diff) | |
download | talos-op-linux-a7196caf83ea9e9b56c5c8c95fbfe0d45acec46b.tar.gz talos-op-linux-a7196caf83ea9e9b56c5c8c95fbfe0d45acec46b.zip |
Merge branch 'asoc-5.6' into asoc-next
Diffstat (limited to 'sound/soc/samsung/idma.c')
-rw-r--r-- | sound/soc/samsung/idma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c index 294dce111b05..66bcc2f97544 100644 --- a/sound/soc/samsung/idma.c +++ b/sound/soc/samsung/idma.c @@ -394,7 +394,6 @@ EXPORT_SYMBOL_GPL(idma_reg_addr_init); static const struct snd_soc_component_driver asoc_idma_platform = { .open = idma_open, .close = idma_close, - .ioctl = snd_soc_pcm_lib_ioctl, .trigger = idma_trigger, .pointer = idma_pointer, .mmap = idma_mmap, |