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

[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
...@@ -146,7 +146,7 @@ config TOUCHSCREEN_TOUCHWIN ...@@ -146,7 +146,7 @@ config TOUCHSCREEN_TOUCHWIN
config TOUCHSCREEN_UCB1400 config TOUCHSCREEN_UCB1400
tristate "Philips UCB1400 touchscreen" tristate "Philips UCB1400 touchscreen"
depends on SND_AC97_BUS select AC97_BUS
help help
This enables support for the Philips UCB1400 touchscreen interface. This enables support for the Philips UCB1400 touchscreen interface.
The UCB1400 is an AC97 audio codec. The touchscreen interface The UCB1400 is an AC97 audio codec. The touchscreen interface
......
...@@ -93,4 +93,12 @@ endmenu ...@@ -93,4 +93,12 @@ endmenu
endif 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 endmenu
...@@ -8,6 +8,9 @@ obj-$(CONFIG_DMASOUND) += oss/ ...@@ -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) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/
obj-$(CONFIG_SND_AOA) += aoa/ 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) ifeq ($(CONFIG_SND),y)
obj-y += last.o obj-y += last.o
endif endif
......
...@@ -26,11 +26,7 @@ config SND_VX_LIB ...@@ -26,11 +26,7 @@ config SND_VX_LIB
config SND_AC97_CODEC config SND_AC97_CODEC
tristate tristate
select SND_PCM select SND_PCM
select SND_AC97_BUS select AC97_BUS
config SND_AC97_BUS
tristate
config SND_DUMMY config SND_DUMMY
tristate "Dummy (/dev/null) soundcard" tristate "Dummy (/dev/null) soundcard"
......
...@@ -10,11 +10,9 @@ snd-ac97-codec-objs += ac97_proc.o ...@@ -10,11 +10,9 @@ snd-ac97-codec-objs += ac97_proc.o
endif endif
snd-ak4531-codec-objs := ak4531_codec.o snd-ak4531-codec-objs := ak4531_codec.o
snd-ac97-bus-objs := ac97_bus.o
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o
obj-$(CONFIG_SND_ENS1370) += snd-ak4531-codec.o obj-$(CONFIG_SND_ENS1370) += snd-ak4531-codec.o
obj-$(CONFIG_SND_AC97_BUS) += snd-ac97-bus.o
obj-m := $(sort $(obj-m)) obj-m := $(sort $(obj-m))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment