diff options
| author | Mark Brown <broonie@kernel.org> | 2020-11-30 16:59:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-30 16:59:12 +0100 |
| commit | 853c15b1249832320b625f8a803c42c162301291 (patch) | |
| tree | c2cf1169878820e26af11c710bbd230783d9b5b9 /sound | |
| parent | ASoC: Add ADAU1372 audio CODEC support (diff) | |
| parent | ASoC: add soc-jack.h (diff) | |
| download | linux-853c15b1249832320b625f8a803c42c162301291.tar.xz linux-853c15b1249832320b625f8a803c42c162301291.zip | |
Merge series "ASoC: tidyup for jack.h" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
Hi Mark
These are jack.h related tidyup.
Kuninori Morimoto (2):
ASoC: soc-core: tidyup jack.h
ASoC: add soc-jack.h
include/sound/soc-jack.h | 132 ++++++++++++++++++++++++++++++++++++
include/sound/soc.h | 122 +--------------------------------
include/trace/events/asoc.h | 1 +
sound/soc/soc-core.c | 1 -
4 files changed, 134 insertions(+), 122 deletions(-)
create mode 100644 include/sound/soc-jack.h
--
2.25.1
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 50b4ce6374a0..4a86e987dcf0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -32,7 +32,6 @@ #include <linux/of_graph.h> #include <linux/dmi.h> #include <sound/core.h> -#include <sound/jack.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> |