From e1036502e5263851259d147771226161e5ccc85a Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 12 Dec 2006 13:32:29 -0500 Subject: [PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem Commit 2d4ba4a3b9aef95d328d74a17ae84f8d658059e2 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: Nicolas Pitre Acked-by: Randy Dunlap Signed-off-by: Linus Torvalds --- sound/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sound/Makefile') diff --git a/sound/Makefile b/sound/Makefile index 5f6bef57e82..9aee54c4882 100644 --- a/sound/Makefile +++ b/sound/Makefile @@ -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 -- cgit v1.2.3-70-g09d2