From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
soc-core.c don't need sound/jack.h anymore, but asoc.h needs it. This patch fixup header magic.
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- include/trace/events/asoc.h | 1 + sound/soc/soc-core.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index 40c300fe704d..4d8ef71090af 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h @@ -7,6 +7,7 @@
#include <linux/ktime.h> #include <linux/tracepoint.h> +#include <sound/jack.h>
#define DAPM_DIRECT "(direct)" #define DAPM_ARROW(dir) (((dir) == SND_SOC_DAPM_DIR_OUT) ? "->" : "<-") 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>