Skip to contentSkip to conversation

-tip: origin tree build failure

PATCH Ingo Molnar 2 participants 3 messages Dec 17, 2009 x86 platform drivers

lore
Share & tools
lore

Ingo Molnar

author Applied
#0 lore raw

Today's -tip failed to build because commit 0d204c34e85d1d63e5fdd3e3192747daf0ee7ec1 ("thinkpad-acpi: basic ALSA mixer support (v2)") from today's upstream kernel causes the following build failure on x86, for CONFIG_THINKPAD_ACPI=y && CONFIG_SOUND=m:

drivers/built-in.o: In function `volume_alsa_notify_change':
thinkpad_acpi.c:(.text+0x2d5c2d): undefined reference to snd_ctl_notify' thinkpad_acpi.c:(.text+0x2d5c47): undefined reference to snd_ctl_notify'

I've applied the patch below to tip:out-of-tree.

Thanks,

Ingo

----------------->
acpi: Build CONFIG_SOUND=m build failure in CONFIG_THINKPAD_ACPI=y

Today's -tip failed to build because thinkpad_acpi.c uses sound facilities unconditionally, without expressing its dependency on the sound subsystem:

drivers/built-in.o: In function `volume_alsa_notify_change':
thinkpad_acpi.c:(.text+0x2d5c2d): undefined reference to snd_ctl_notify' thinkpad_acpi.c:(.text+0x2d5c47): undefined reference to snd_ctl_notify'

Add a Kconfig dependency on SOUND to remedy this.

Cc Len Brown <[email protected]>
Cc Henrique de Moraes Holschuh <[email protected]>
Cc Lorne Applebaum <[email protected]>
Cc Matthew Garrett <[email protected]>
Cc Linus Torvalds <[email protected]>
---
 drivers/platform/x86/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/platform/x86/Kconfig +1 -0
index f8bec62..60083e9 100644
@@ -216,6 +216,7 @@ config THINKPAD_ACPI
 	depends on ACPI
 	depends on INPUT
 	depends on RFKILL || RFKILL = n
+	depends on SOUND
 	select BACKLIGHT_LCD_SUPPORT
 	select BACKLIGHT_CLASS_DEVICE
 	select HWMON
#1 lore raw

Thank you!

Quoted 6 lines · Ingo Molnar

Today's -tip failed to build because commit 0d204c34e85d1d63e5fdd3e3192747daf0ee7ec1 ("thinkpad-acpi: basic ALSA mixer
support (v2)") from today's upstream kernel causes the following build failure
on x86, for CONFIG_THINKPAD_ACPI=y && CONFIG_SOUND=m:

...

Quoted 5 lines
drivers/platform/x86/Kconfig +1 -0
 	depends on RFKILL || RFKILL = n
+       depends on SOUND
 	select BACKLIGHT_LCD_SUPPORT
 	select BACKLIGHT_CLASS_DEVICE
 	select HWMON
Signature · 4 lines
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh
#2 lore raw
In reply to Ingo Molnar
Quoted 1 line · Ingo Molnar

Add a Kconfig dependency on SOUND to remedy this.

ok, that should have been CONFIG_SND. Updated patch below.

Ingo

------------------->

Quoted 1 line

From f9bf1de0fcb6dddf0145d472b13a21ab8e7723cd Mon Sep 17 00:00:00 2001

From: Ingo Molnar <[email protected]>
Date: Thu, 17 Dec 2009 07:08:12 +0100
Subject: [PATCH] acpi: Build CONFIG_SOUND=m build failure in CONFIG_THINKPAD_ACPI

-tip testing found that commit 0d204c34e85d1d63e5fdd3e3192747daf0ee7ec1 ("thinkpad-acpi: basic ALSA mixer support (v2)") from today's upstream kernel causes the following build failure on x86, for CONFIG_THINKPAD_ACPI=y && CONFIG_SOUND=m:

drivers/built-in.o: In function `volume_alsa_notify_change':
thinkpad_acpi.c:(.text+0x2d5c2d): undefined reference to snd_ctl_notify' thinkpad_acpi.c:(.text+0x2d5c47): undefined reference to snd_ctl_notify'

This build fails because thinkpad_acpi.c uses sound facilities unconditionally, without expressing its dependency on the sound subsystem.

Add a Kconfig dependency on SOUND to remedy this.

Cc Len Brown <[email protected]>
Cc Henrique de Moraes Holschuh <[email protected]>
Cc Lorne Applebaum <[email protected]>
Cc Matthew Garrett <[email protected]>
Cc Linus Torvalds <[email protected]>
---
 drivers/platform/x86/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/platform/x86/Kconfig +1 -0
index f8bec62..dbd4ef1 100644
@@ -216,6 +216,7 @@ config THINKPAD_ACPI
 	depends on ACPI
 	depends on INPUT
 	depends on RFKILL || RFKILL = n
+	depends on SND
 	select BACKLIGHT_LCD_SUPPORT
 	select BACKLIGHT_CLASS_DEVICE
 	select HWMON