Merge branch 'topic/pcxhr-update' into to-push

git-mirror · Dec 25, 2008 · a9c3c7e · a9c3c7e
2 parents cc49108 + ade9b2f
commit a9c3c7e
Show file tree

Hide file tree

Showing 9 changed files with 1,995 additions and 521 deletions.
diff --git a/sound/pci/pcxhr/Makefile b/sound/pci/pcxhr/Makefile
@@ -1,2 +1,2 @@
-snd-pcxhr-objs := pcxhr.o pcxhr_hwdep.o pcxhr_mixer.o pcxhr_core.o
+snd-pcxhr-objs := pcxhr.o pcxhr_hwdep.o pcxhr_mixer.o pcxhr_core.o pcxhr_mix22.o
 obj-$(CONFIG_SND_PCXHR) += snd-pcxhr.o