Commit e1036502 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Linus Torvalds
Browse files

[PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem 



Commit 2d4ba4a3 introduced a dependency
that was never meant to exist when the ac97_bus.c module was created.
Move ac97_bus.c up the directory hierarchy to make sure it is built when
selected even if sound is configured out so things work as originally
intended.

Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 741441ab

drivers/input/touchscreen/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ config TOUCHSCREEN_TOUCHWIN 


config TOUCHSCREEN_UCB1400

	tristate "Philips UCB1400 touchscreen"

	depends on SND_AC97_BUS

	select AC97_BUS

	help

	  This enables support for the Philips UCB1400 touchscreen interface.

	  The UCB1400 is an AC97 audio codec.  The touchscreen interface

sound/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -93,4 +93,12 @@ endmenu 


endif



config AC97_BUS

	tristate

	help

	  This is used to avoid config and link hard dependencies between the

	  sound subsystem and other function drivers completely unrelated to

	  sound although they're sharing the AC97 bus. Concerned drivers

	  should "select" this.



endmenu

sound/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ obj-$(CONFIG_DMASOUND) += oss/ 
obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/

obj-$(CONFIG_SND_AOA) += aoa/



# This one must be compilable even if sound is configured out

obj-$(CONFIG_AC97_BUS) += ac97_bus.o



ifeq ($(CONFIG_SND),y)

  obj-y += last.o

endif

sound/pci/ac97/ac97_bus.c→sound/ac97_bus.c

+0 −0

File moved.

View file

sound/drivers/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -26,11 +26,7 @@ config SND_VX_LIB 
config SND_AC97_CODEC

	tristate

	select SND_PCM

	select SND_AC97_BUS



config SND_AC97_BUS

	tristate



	select AC97_BUS



config SND_DUMMY

	tristate "Dummy (/dev/null) soundcard"

CRA Git | Maintained and supported by SUSTech CRA and CCSE