aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@intel.com>2018-01-04 21:30:23 -0600
committerLiam Girdwood <liam.r.girdwood@linux.intel.com>2018-01-08 12:13:46 +0000
commit0af74c04dad7c7d34301943c4b74b28ddf1cef08 (patch)
tree120bbd04b1b97918bd3378822ca9c02d1ad29362
parent620d91810fd203db561da3fe2ff98676cd62ec58 (diff)
downloadasoc-topic/sof-v4.14-stable.tar.gz
I think I finally got what was wrong, we have missing dependencies on SND_DMA_SGBUF and also using the wrong version of uaccess.h (needs to be the linux/ not asm/) I pushed a branch on github to see if this makes 0day happy. I might squash this with the SOF core if this is fine. we really need to close this sort of stuff or the upstream work is going to be delayed. While I am at it, we need to change all the copyright notices to use the SPDX versions, do you know of a script which can do this? Again the sooner we do it the better. Cheers -Pierre
-rw-r--r--sound/soc/sof/Kconfig1
-rw-r--r--sound/soc/sof/debug.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 9ccdc2af33ffac..c83baf1000679a 100644
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -13,6 +13,7 @@ config SND_SOC_SOF_NOCODEC
config SND_SOC_SOF
tristate "Sound Open Firmware Support"
default m
+ depends on SND_DMA_SGBUF
select SND_SOC_TOPOLOGY
select SND_SOC_COMPRESS
select SND_SOC_SOF_NOCODEC
diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
index 9f16ae050d99e1..5d20027218addd 100644
--- a/sound/soc/sof/debug.c
+++ b/sound/soc/sof/debug.c
@@ -63,7 +63,7 @@
#include <linux/pm.h>
#include <linux/pm_runtime.h>
#include <linux/debugfs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <uapi/sound/sof-ipc.h>
#include "sof-priv.h"
#include "ops.h"