diff options
| author | Nicolas Pitre <nico@cam.org> | 2006-12-12 19:32:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 19:43:21 +0100 |
| commit | e1036502e5263851259d147771226161e5ccc85a (patch) | |
| tree | 46a88e0b23dbb1df5d38e6b210d09641974274e9 /sound/Makefile | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-e1036502e5263851259d147771226161e5ccc85a.tar.xz linux-e1036502e5263851259d147771226161e5ccc85a.zip | |
[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 <nico@cam.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/Makefile')
| -rw-r--r-- | sound/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/Makefile b/sound/Makefile index 5f6bef57e825..9aee54c4882d 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 |