Patchwork [1/2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC

login
register
mail settings
Submitter Uwe Kleine-König
Date July 25, 2011, 3:47 p.m.
Message ID <1311608874-31863-1-git-send-email-u.kleine-koenig@pengutronix.de>
Download mbox | patch
Permalink /patch/106708/
State New
Headers show

Comments

Uwe Kleine-König - July 25, 2011, 3:47 p.m.
This fixes:
	warning: (MACH_HARMONY && MACH_KAEN && MACH_SEABOARD) selects MACH_HAS_SND_SOC_TEGRA_WM8903 which has unmet direct dependencies (SOUND && !M68K && SND && SND_SOC)

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 arch/arm/mach-tegra/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Stephen Warren - July 25, 2011, 4:14 p.m.
Uwe Kleine-König wrote at Monday, July 25, 2011 9:48 AM:
> This fixes:

> 	warning: (MACH_HARMONY && MACH_KAEN && MACH_SEABOARD) selects MACH_HAS_SND_SOC_TEGRA_WM8903

> which has unmet direct dependencies (SOUND && !M68K && SND && SND_SOC)


> diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig

...
>  config MACH_HARMONY

>         bool "Harmony board"

> -       select MACH_HAS_SND_SOC_TEGRA_WM8903

> +       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC


Shouldn't that be SND_SOC?

-- 
nvpublic
Uwe Kleine-König - July 25, 2011, 9:13 p.m.
On Mon, Jul 25, 2011 at 09:14:49AM -0700, Stephen Warren wrote:
> Uwe Kleine-König wrote at Monday, July 25, 2011 9:48 AM:
> > This fixes:
> > 	warning: (MACH_HARMONY && MACH_KAEN && MACH_SEABOARD) selects MACH_HAS_SND_SOC_TEGRA_WM8903
> > which has unmet direct dependencies (SOUND && !M68K && SND && SND_SOC)
> 
> > diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
> ...
> >  config MACH_HARMONY
> >         bool "Harmony board"
> > -       select MACH_HAS_SND_SOC_TEGRA_WM8903
> > +       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC
> 
> Shouldn't that be SND_SOC?
Hmm, with SOUND_SOC the warning is gone, too :-)

Yeah, will send a fixed patch tomorrow.

Uwe

Patch

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 5ec1846..33acbd9 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -27,14 +27,14 @@  comment "Tegra board type"
 
 config MACH_HARMONY
        bool "Harmony board"
-       select MACH_HAS_SND_SOC_TEGRA_WM8903
+       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC
        help
          Support for nVidia Harmony development platform
 
 config MACH_KAEN
        bool "Kaen board"
        select MACH_SEABOARD
-       select MACH_HAS_SND_SOC_TEGRA_WM8903
+       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC
        help
          Support for the Kaen version of Seaboard
 
@@ -45,7 +45,7 @@  config MACH_PAZ00
 
 config MACH_SEABOARD
        bool "Seaboard board"
-       select MACH_HAS_SND_SOC_TEGRA_WM8903
+       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SOUND_SOC
        help
          Support for nVidia Seaboard development platform. It will
 	 also be included for some of the derivative boards that