From da815925f02fcaf4c364c699bfd7d1559a76a5dc Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 16 Jul 2018 13:17:37 -0500 Subject: [PATCH 1/2] [SQUASHME] ASoC: SOF: remove unused SOF_PLATFORM from Makefile/Kconfig This option points to non-existent files, remove. Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/Kconfig | 3 --- sound/soc/sof/Makefile | 2 -- 2 files changed, 5 deletions(-) diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig index cec2ea91df14dc..ba54d82fd7da6b 100644 --- a/sound/soc/sof/Kconfig +++ b/sound/soc/sof/Kconfig @@ -4,9 +4,6 @@ config SND_SOC_SOF_PCI config SND_SOC_SOF_ACPI tristate -config SND_SOC_SOF_PLATFORM - tristate - config SND_SOC_SOF tristate "Sound Open Firmware Support" default m diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile index b3ba39d61b2a9e..b8f6c67fbb7b70 100644 --- a/sound/soc/sof/Makefile +++ b/sound/soc/sof/Makefile @@ -8,7 +8,6 @@ snd-sof-spi-objs := hw-spi.o snd-sof-pci-objs := sof-pci-dev.o snd-sof-acpi-objs := sof-acpi-dev.o -snd-sof-platform-objs := sof-platform-dev.o snd-sof-nocodec-objs := nocodec.o obj-$(CONFIG_SND_SOC_SOF) += snd-sof.o @@ -17,7 +16,6 @@ obj-$(CONFIG_SND_SOC_SOF_NOCODEC) += snd-sof-nocodec.o obj-$(CONFIG_SND_SOC_SOF_ACPI) += sof-acpi-dev.o obj-$(CONFIG_SND_SOC_SOF_PCI) += sof-pci-dev.o obj-$(CONFIG_SND_SOC_SOF_SPI) += sof-spi-dev.o -obj-$(SND_SOC_SOF_PLATFORM) += sof-platform-dev.o obj-$(CONFIG_SND_SOC_SOF_SPIDSP) += snd-sof-spi.o From 9c4694e18c46e59b64d35ecfd049c8abfd11dbe7 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 16 Jul 2018 13:24:13 -0500 Subject: [PATCH 2/2] [SQUASHME] ASoC: SOF: default should not be module Not sure why this was added but this is not quite right Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig index ba54d82fd7da6b..322cf65c51ff57 100644 --- a/sound/soc/sof/Kconfig +++ b/sound/soc/sof/Kconfig @@ -6,7 +6,6 @@ config SND_SOC_SOF_ACPI config SND_SOC_SOF tristate "Sound Open Firmware Support" - default m select SND_SOC_TOPOLOGY select SND_SOC_COMPRESS help