diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-01-11 09:03:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-11 09:03:40 +0100 |
| commit | 3cdca6d62b8e948ca9c148deec7424b664d50cd9 (patch) | |
| tree | 836c59f119343ab509ce5a7cb0c706000fe19369 /sound/soc/intel | |
| parent | ALSA: hda: Fix a typo in comments (diff) | |
| parent | ALSA: hda: Rename back to dmic_detect option (diff) | |
| download | linux-dev-3cdca6d62b8e948ca9c148deec7424b664d50cd9.tar.xz linux-dev-3cdca6d62b8e948ca9c148deec7424b664d50cd9.zip | |
Merge branch 'for-linus' into for-next
Sync 5.5-devel branch once again for applying the HD-audio fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/boards/cml_rt1011_rt5682.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c index a22f97234201..5f1bf6d3800c 100644 --- a/sound/soc/intel/boards/cml_rt1011_rt5682.c +++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c @@ -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> |