The following commit has been merged into the core/headers branch of tip: Commit-ID: 321354ba6883b5151fd283dc14fb29280e1fbd2e Gitweb: https://git.kernel.org/tip/321354ba6883b5151fd283dc14fb29280e1fbd2e Author: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> AuthorDate: Tue, 26 Nov 2019 08:54:14 -08:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 10 Dec 2019 10:15:48 +01:00 ASoC: Intel: Skylake: Explicitly include linux/io.h for virt_to_phys() Through a labyrinthian sequence of includes, usage of virt_to_phys() is dependent on the include of asm/io.h in x86's asm/realmode.h, which is included in x86's asm/acpi.h and thus by linux/acpi.h. Explicitly include linux/io.h to break the dependency on realmode.h so that a future patch can remove the realmode.h include from acpi.h without breaking the build. Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> Acked-by: Mark Brown <broonie@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20191126165417.22423-10-sean.j.christopherson@xxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- sound/soc/intel/skylake/skl-sst-cldma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/skylake/skl-sst-cldma.c b/sound/soc/intel/skylake/skl-sst-cldma.c index 5a2c35f..36f697c 100644 --- a/sound/soc/intel/skylake/skl-sst-cldma.c +++ b/sound/soc/intel/skylake/skl-sst-cldma.c @@ -8,6 +8,7 @@ */ #include <linux/device.h> +#include <linux/io.h> #include <linux/mm.h> #include <linux/delay.h> #include "../common/sst-dsp.h"
|