Applied "ASoC: qcom: qdsp6: remove duplicated include" to the asoc tree

Message ID
State New
Headers show
  • Applied "ASoC: qcom: qdsp6: remove duplicated include" to the asoc tree
Related show

Commit Message

Mark Brown Sept. 27, 2018, 10:39 p.m.
The patch

   ASoC: qcom: qdsp6: remove duplicated include

has been applied to the asoc tree at 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.


From 06da26e5ce157bf2af09ef4a9f5dc30af4599fa0 Mon Sep 17 00:00:00 2001
From: YueHaibing <>

Date: Wed, 26 Sep 2018 15:33:03 +0800
Subject: [PATCH] ASoC: qcom: qdsp6: remove duplicated include

Remove duplicated includes linux/of_platform.h
and linux/wait.h

Signed-off-by: YueHaibing <>

Signed-off-by: Mark Brown <>

 sound/soc/qcom/qdsp6/q6asm.c  | 1 -
 sound/soc/qcom/qdsp6/q6core.c | 1 -
 2 files changed, 2 deletions(-)


Alsa-devel mailing list


diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c
index 2b2c7233bb5f..e1cfa846a1dc 100644
--- a/sound/soc/qcom/qdsp6/q6asm.c
+++ b/sound/soc/qcom/qdsp6/q6asm.c
@@ -11,7 +11,6 @@ 
 #include <linux/spinlock.h>
 #include <linux/kref.h>
 #include <linux/of.h>
-#include <linux/of_platform.h>
 #include <uapi/sound/asound.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
diff --git a/sound/soc/qcom/qdsp6/q6core.c b/sound/soc/qcom/qdsp6/q6core.c
index ca1be7305524..cdfc8ab6cfc0 100644
--- a/sound/soc/qcom/qdsp6/q6core.c
+++ b/sound/soc/qcom/qdsp6/q6core.c
@@ -10,7 +10,6 @@ 
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/jiffies.h>
-#include <linux/wait.h>
 #include <linux/soc/qcom/apr.h>
 #include "q6core.h"
 #include "q6dsp-errno.h"