Patchwork [v2] ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC

login
register
mail settings
Submitter Uwe Kleine-König
Date July 26, 2011, 8:15 a.m.
Message ID <1311668159-11337-1-git-send-email-u.kleine-koenig@pengutronix.de>
Download mbox | patch
Permalink /patch/106791/
State New
Headers show

Comments

Uwe Kleine-König - July 26, 2011, 8:15 a.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>
---
Changes since (implicit) v1:
 - correctly depend on SND_SOC instead of the non-existent SOUND_SOC
 - fix commit log accordingly

Thanks to Stephen Warren for noticing.

Best regards
Uwe

 arch/arm/mach-tegra/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Stephen Warren - July 26, 2011, 3:48 p.m.
Uwe Kleine-König wrote at Tuesday, July 26, 2011 2:16 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)

> 

> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>


Acked-by: Stephen Warren <swarren@nvidia.com>


(I'm also CC'ing the various maintainers explicitly, so they see the patch,
and can decide which git tree to take this through)

> ---

> Changes since (implicit) v1:

>  - correctly depend on SND_SOC instead of the non-existent SOUND_SOC

>  - fix commit log accordingly

> 

> Thanks to Stephen Warren for noticing.

> 

> Best regards

> Uwe

> 

>  arch/arm/mach-tegra/Kconfig |    6 +++---

>  1 files changed, 3 insertions(+), 3 deletions(-)

> 

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

> index 5ec1846..fec64f3 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 SND_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 SND_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 SND_SOC

>         help

>           Support for nVidia Seaboard development platform. It will

>  	 also be included for some of the derivative boards that

> --

> 1.7.5.4


-- 
nvpublic
Colin Cross - July 26, 2011, 11 p.m.
On Tue, Jul 26, 2011 at 8:48 AM, Stephen Warren <swarren@nvidia.com> wrote:
> Uwe Kleine-König wrote at Tuesday, July 26, 2011 2:16 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)
>>
>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
>
> Acked-by: Stephen Warren <swarren@nvidia.com>
>
> (I'm also CC'ing the various maintainers explicitly, so they see the patch,
> and can decide which git tree to take this through)

Acked-By: Colin Cross <ccross@android.com>

Arnd, can you take this?

>> ---
>> Changes since (implicit) v1:
>>  - correctly depend on SND_SOC instead of the non-existent SOUND_SOC
>>  - fix commit log accordingly
>>
>> Thanks to Stephen Warren for noticing.
>>
>> Best regards
>> Uwe
>>
>>  arch/arm/mach-tegra/Kconfig |    6 +++---
>>  1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
>> index 5ec1846..fec64f3 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 SND_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 SND_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 SND_SOC
>>         help
>>           Support for nVidia Seaboard development platform. It will
>>        also be included for some of the derivative boards that
>> --
>> 1.7.5.4
>
> --
> nvpublic
>
>
Arnd Bergmann - July 27, 2011, 3:11 p.m.
On Wednesday 27 July 2011, Colin Cross wrote:
> >> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> >
> > Acked-by: Stephen Warren <swarren@nvidia.com>
> 
> Acked-By: Colin Cross <ccross@android.com>
> 
> Arnd, can you take this?
> 

Applied to 'fixes' branch, thanks everyone!

	Arnd
Uwe Kleine-König - July 27, 2011, 3:31 p.m.
Hello Arnd,

On Wed, Jul 27, 2011 at 05:11:04PM +0200, Arnd Bergmann wrote:
> Applied to 'fixes' branch, thanks everyone!
Would you care to take the other patch in this series, too?
(http://thread.gmane.org/gmane.linux.ports.tegra/1138/focus=1139)

Thanks
Uwe
Arnd Bergmann - July 27, 2011, 4:33 p.m.
On Wednesday 27 July 2011, Uwe Kleine-König wrote:
> On Wed, Jul 27, 2011 at 05:11:04PM +0200, Arnd Bergmann wrote:
> > Applied to 'fixes' branch, thanks everyone!
> Would you care to take the other patch in this series, too?
> (http://thread.gmane.org/gmane.linux.ports.tegra/1138/focus=1139)

That does not look like a bug fix to me. I don't mind the patch,
but I see no reason to apply it at this point, or to the 'fixes'
branch.

I'll wait for Colin to accumulate more patches and then pull those
from him into a tegra specific branch for 3.2, ok? If Colin wants
to have it 3.1, I can pull it into the fixes branch after -rc1.

	Arnd

Patch

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 5ec1846..fec64f3 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 SND_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 SND_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 SND_SOC
        help
          Support for nVidia Seaboard development platform. It will
 	 also be included for some of the derivative boards that