Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for issue: 3.15.6 - error compiling pcm512 sound drivers #641 #654

Merged
merged 6 commits into from
Aug 4, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sound/soc/bcm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ config SND_BCM2708_SOC_RPI_DAC
config SND_BCM2708_SOC_IQAUDIO_DAC
tristate "Support for IQaudIO-DAC"
depends on SND_BCM2708_SOC_I2S
select SND_SOC_PCM512x
select SND_SOC_PCM512x_I2C
help
Say Y or M if you want to add support for IQaudIO-DAC.
2 changes: 1 addition & 1 deletion sound/soc/bcm/iqaudio-dac.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static struct snd_soc_dai_link snd_rpi_iqaudio_dac_dai[] = {

/* audio machine driver */
static struct snd_soc_card snd_rpi_iqaudio_dac = {
.name = "snd_rpi_iqaudio_dac",
.name = "IQaudIODAC",
.dai_link = snd_rpi_iqaudio_dac_dai,
.num_links = ARRAY_SIZE(snd_rpi_iqaudio_dac_dai),
};
Expand Down
4 changes: 0 additions & 4 deletions sound/soc/codecs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ config SND_SOC_ALL_CODECS
select SND_SOC_PCM512x_SPI if SPI_MASTER
select SND_SOC_PCM1794A
select SND_SOC_PCM5102A
select SND_SOC_PCM512x if SND_SOC_I2C_AND_SPI
select SND_SOC_RT5631 if I2C
select SND_SOC_RT5640 if I2C
select SND_SOC_SGTL5000 if I2C
Expand Down Expand Up @@ -399,9 +398,6 @@ config SND_SOC_PCM1794A
config SND_SOC_PCM5102A
tristate

config SND_SOC_PCM512x
tristate

config SND_SOC_RT5631
tristate

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
snd-soc-pcm512x-spi-objs := pcm512x-spi.o
snd-soc-pcm1794a-objs := pcm1794a.o
snd-soc-pcm5102a-objs := pcm5102a.o
snd-soc-pcm512x-objs := pcm512x.o
snd-soc-rt5631-objs := rt5631.o
snd-soc-rt5640-objs := rt5640.o
snd-soc-sgtl5000-objs := sgtl5000.o
Expand Down Expand Up @@ -214,7 +213,6 @@ obj-$(CONFIG_SND_SOC_PCM512x_I2C) += snd-soc-pcm512x-i2c.o
obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o
obj-$(CONFIG_SND_SOC_PCM1794A) += snd-soc-pcm1794a.o
obj-$(CONFIG_SND_SOC_PCM5102A) += snd-soc-pcm5102a.o
obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o
obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o
obj-$(CONFIG_SND_SOC_RT5640) += snd-soc-rt5640.o
obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o
Expand Down
Loading