Hi, On Tue, Apr 12, 2011 at 10:40 AM, Stephen Warren <swarren@xxxxxxxxxx> wrote: > diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig > index 21125b3..14f7119 100644 > --- a/sound/soc/tegra/Kconfig > +++ b/sound/soc/tegra/Kconfig > @@ -16,12 +16,13 @@ config SND_SOC_TEGRA_I2S > > config SND_SOC_TEGRA_WM8903 > tristate "SoC Audio support for Tegra boards using a WM8903 codec" > - depends on SND_SOC_TEGRA && MACH_HARMONY && I2C > + depends on SND_SOC_TEGRA && I2C > + depends on MACH_HARMONY || MACH_VENTANA || MACH_SEABOARD || MACH_KAEN || MACH_AEBL This kind of Kconfig logic scales poorly. It's better to add a silent option that those boards select in their Kconfig (something like MACH_TEGRA_HAS_WM8903 or whatever), and depend on that. Fewer merge conflicts down the road, etc. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html