Skip to contentSkip to conversation

ASoC: Intel: boards: Fix compile-testing RT1011/RT5682

PATCH In review Arnd Bergmann 3 participants 3 messages Jan 2, 2020 – Jan 3, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: Intel: boards: Fix compile-testing RT1011/RT5682

On non-x86, the new driver results in a build failure:

sound/soc/intel/boards/cml_rt1011_rt5682.c:14:10: fatal error: asm/cpu_device_id.h: No such file or directory

The asm/cpu_device_id.h header is not actually needed here, so don't include it.

---
I found this last week, but the patch still seems to be needed as I could not find a fix in mainline or -next.

Please ignore if there is already a fix in some other tree.

 sound/soc/intel/boards/cml_rt1011_rt5682.c | 1 -
 1 file changed, 1 deletion(-)
sound/soc/intel/boards/cml_rt1011_rt5682.c +0 -1
index a22f97234201..5f1bf6d3800c 100644
@@ -11,7 +11,6 @@
 #include <linux/clk.h>
 #include <linux/dmi.h>
 #include <linux/slab.h>
-#include <asm/cpu_device_id.h>
 #include <linux/acpi.h>
 #include <sound/core.h>
 #include <sound/jack.h>
Signature · 1 line
2.20.0
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Arnd Bergmann

On non-x86, the new driver results in a build failure:

sound/soc/intel/boards/cml_rt1011_rt5682.c:14:10: fatal error: asm/cpu_device_id.h: No such file or directory

The asm/cpu_device_id.h header is not actually needed here, so don't include it.

Indeed it's not needed, thanks for spotting this.

Quoted 23 lines

---
I found this last week, but the patch still seems to be needed as I could not find a fix in mainline or -next.

Please ignore if there is already a fix in some other tree.

  sound/soc/intel/boards/cml_rt1011_rt5682.c | 1 -
  1 file changed, 1 deletion(-)
sound/soc/intel/boards/cml_rt1011_rt5682.c +0 -1
index a22f97234201..5f1bf6d3800c 100644
@@ -11,7 +11,6 @@
  #include <linux/clk.h>
  #include <linux/dmi.h>
  #include <linux/slab.h>
-#include <asm/cpu_device_id.h>
  #include <linux/acpi.h>
  #include <sound/core.h>
  #include <sound/jack.h>
maintainer
#2 lore raw

Applied "ASoC: Intel: boards: Fix compile-testing RT1011/RT5682" to the asoc tree

In reply to Arnd Bergmann

The patch

ASoC: Intel: boards: Fix compile-testing RT1011/RT5682

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5

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.

Thanks,
Mark

From ff3b57417012fcc963ec281f5705bed837e4b1ac Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Thu, 2 Jan 2020 14:52:55 +0100
Subject: [PATCH] ASoC: Intel: boards: Fix compile-testing RT1011/RT5682

On non-x86, the new driver results in a build failure:

sound/soc/intel/boards/cml_rt1011_rt5682.c:14:10: fatal error: asm/cpu_device_id.h: No such file or directory

The asm/cpu_device_id.h header is not actually needed here, so don't include it.

---
 sound/soc/intel/boards/cml_rt1011_rt5682.c | 1 -
 1 file changed, 1 deletion(-)
sound/soc/intel/boards/cml_rt1011_rt5682.c +0 -1
index a22f97234201..5f1bf6d3800c 100644
@@ -11,7 +11,6 @@
 #include <linux/clk.h>
 #include <linux/dmi.h>
 #include <linux/slab.h>
-#include <asm/cpu_device_id.h>
 #include <linux/acpi.h>
 #include <sound/core.h>
 #include <sound/jack.h>
Signature · 1 line
2.20.1