---

yaml --- r: 16153 b: refs/heads/master c: e12229b h: refs/heads/master i: 16151: b944fb7 v: v3
git-mirror · Jan 3, 2006 · b2a126b · b2a126b
1 parent 96030f4
commit b2a126b
Show file tree

Hide file tree

Showing 13 changed files with 4,518 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46a1736d7c07687e7456f72b238a68034fd5a624
+refs/heads/master: e12229b4d2b7863b1baaeca759aa87703bf9fdf8
diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1103,6 +1103,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     This module supports only one card, autoprobe and PnP.
 
+  Module snd-pcxhr
+  ----------------
+
+    Module for Digigram PCXHR boards
+
+    This module supports multiple cards.
+
   Module snd-powermac (on ppc only)
   ---------------------------------
 

diff --git a/trunk/sound/pci/Kconfig b/trunk/sound/pci/Kconfig
@@ -455,6 +455,17 @@ config SND_NM256
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-nm256.
 
+config SND_PCXHR
+	tristate "Digigram PCXHR"
+	depends on SND
+	select SND_PCM
+	select SND_HWDEP
+	help
+	  Say Y here to include support for Digigram PCXHR boards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called snd-pcxhr.
+
 config SND_RME32
 	tristate "RME Digi32, 32/8, 32 PRO"
 	depends on SND

diff --git a/trunk/sound/pci/Makefile b/trunk/sound/pci/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_SND) += \
 	korg1212/ \
 	mixart/ \
 	nm256/ \
+	pcxhr/ \
 	rme9652/ \
 	trident/ \
 	ymfpci/ \

diff --git a/trunk/sound/pci/pcxhr/Makefile b/trunk/sound/pci/pcxhr/Makefile
@@ -0,0 +1,2 @@
+snd-pcxhr-objs := pcxhr.o pcxhr_hwdep.o pcxhr_mixer.o pcxhr_core.o
+obj-$(CONFIG_SND_PCXHR) += snd-pcxhr.o
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		snd-pcxhr-objs := pcxhr.o pcxhr_hwdep.o pcxhr_mixer.o pcxhr_core.o
		obj-$(CONFIG_SND_PCXHR) += snd-pcxhr.o