| Message ID | 1398496909-27785-2-git-send-email-kaixu.xia@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Saturday 26 April 2014 15:21:35 Xia Kaixu wrote: > From: Arnd Bergmann <arnd@arndb.de> > > This was fixed before, but is required again. > SND_SOC cannot be built-in if I2C=m This patch has a longer history, it was superceded at some point, and then we needed it again and I didn't bother to write a proper description. It seems that it's resolved now and won't be needed again. Please just drop it from the series. Arnd > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org> > Cc: Jaroslav Kysela <perex@perex.cz> > Cc: Takashi Iwai <tiwai@suse.de> > Cc: Mark Brown <broonie@kernel.org> > Cc: Liam Girdwood <lgirdwood@gmail.com> > Cc: alsa-devel@alsa-project.org > --- > sound/soc/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig > index 0060b31..b976f72 100644 > --- a/sound/soc/Kconfig > +++ b/sound/soc/Kconfig > @@ -4,6 +4,7 @@ > > menuconfig SND_SOC > tristate "ALSA for SoC audio support" > + depends on I2C || !I2C # SND_SOC cannot be built-in if I2C=m > select SND_PCM > select AC97_BUS if SND_SOC_AC97_BUS > select SND_JACK if INPUT=y || INPUT=SND >
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 0060b31..b976f72 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -4,6 +4,7 @@ menuconfig SND_SOC tristate "ALSA for SoC audio support" + depends on I2C || !I2C # SND_SOC cannot be built-in if I2C=m select SND_PCM select AC97_BUS if SND_SOC_AC97_BUS select SND_JACK if INPUT=y || INPUT=SND