summaryrefslogtreecommitdiff
path: root/sound/mips/Makefile
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-07-15 20:19:14 +0100
committerBen Dooks <ben-linux@fluff.org>2008-07-15 20:19:14 +0100
commit0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch)
tree313b3b9ca04727f3704464e01d8dd97da1dd534b /sound/mips/Makefile
parent19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff)
parentb9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff)
downloadlinux-3.10-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.tar.gz
linux-3.10-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.tar.bz2
linux-3.10-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'sound/mips/Makefile')
-rw-r--r--sound/mips/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/mips/Makefile b/sound/mips/Makefile
index 47afed971fb..861ec0a574b 100644
--- a/sound/mips/Makefile
+++ b/sound/mips/Makefile
@@ -3,6 +3,10 @@
#
snd-au1x00-objs := au1x00.o
+snd-sgi-o2-objs := sgio2audio.o ad1843.o
+snd-sgi-hal2-objs := hal2.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_AU1X00) += snd-au1x00.o
+obj-$(CONFIG_SND_SGI_O2) += snd-sgi-o2.o
+obj-$(CONFIG_SND_SGI_HAL2) += snd-sgi-hal2.o