Merge tag 'md-3.11' of git://neil.brown.name/md

[~andy/linux] / sound / usb / Kconfig

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 225dfd737265411bead537f7f839b75863432e51..de9408b83f7577b22071aac72b1ecf0390522d44 100644 (file)
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -115,5 +115,36 @@ config SND_USB_6FIRE
           and further help can be found at
           http://sixfireusb.sourceforge.net
 
+config SND_USB_HIFACE
+        tristate "M2Tech hiFace USB-SPDIF driver"
+        select SND_PCM
+        help
+         Select this option to include support for M2Tech hiFace USB-SPDIF
+         interface.
+
+         This driver supports the original M2Tech hiFace and some other
+         compatible devices. The supported products are:
+
+           * M2Tech Young
+           * M2Tech hiFace
+           * M2Tech North Star
+           * M2Tech W4S Young
+           * M2Tech Corrson
+           * M2Tech AUDIA
+           * M2Tech SL Audio
+           * M2Tech Empirical
+           * M2Tech Rockna
+           * M2Tech Pathos
+           * M2Tech Metronome
+           * M2Tech CAD
+           * M2Tech Audio Esclusive
+           * M2Tech Rotel
+           * M2Tech Eeaudio
+           * The Chord Company CHORD
+           * AVA Group A/S Vitus
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-usb-hiface.
+
 endif  # SND_USB