diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2011-01-10 10:17:26 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 10:46:42 -0500 |
commit | 8443d2eb81e30dcc027e531eaa442cdb2477c5ab (patch) | |
tree | 558571ef07c0ed287fbe6d8b274ccbf814c044ef /sound/pci | |
parent | 8c50b75979a198194a38d38d855f9d7e9cac2889 (diff) |
ALSA: oxygen: add X-Meridian 2G support
Add support for the AuzenTech X-Meridian 7.1 2G sound card.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/Kconfig | 1 | ||||
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 7b2678a25ca0..ddb5e6969bb4 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -218,6 +218,7 @@ config SND_OXYGEN | |||
218 | C-Media CMI8788 (Oxygen HD Audio) chip: | 218 | C-Media CMI8788 (Oxygen HD Audio) chip: |
219 | * Asound A-8788 | 219 | * Asound A-8788 |
220 | * AuzenTech X-Meridian | 220 | * AuzenTech X-Meridian |
221 | * AuzenTech X-Meridian 2G | ||
221 | * Bgears b-Enspirer | 222 | * Bgears b-Enspirer |
222 | * Club3D Theatron DTS | 223 | * Club3D Theatron DTS |
223 | * HT-Omega Claro (plus) | 224 | * HT-Omega Claro (plus) |
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index e187c951b6a0..304f1a5681f3 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -102,6 +102,8 @@ static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = { | |||
102 | { OXYGEN_PCI_SUBID(0x14c3, 0x1711), .driver_data = MODEL_2CH_OUTPUT }, | 102 | { OXYGEN_PCI_SUBID(0x14c3, 0x1711), .driver_data = MODEL_2CH_OUTPUT }, |
103 | /* AuzenTech X-Meridian */ | 103 | /* AuzenTech X-Meridian */ |
104 | { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN }, | 104 | { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN }, |
105 | /* AuzenTech X-Meridian 2G */ | ||
106 | { OXYGEN_PCI_SUBID(0x5431, 0x017a), .driver_data = MODEL_MERIDIAN }, | ||
105 | /* HT-Omega Claro */ | 107 | /* HT-Omega Claro */ |
106 | { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CLARO }, | 108 | { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CLARO }, |
107 | /* HT-Omega Claro halo */ | 109 | /* HT-Omega Claro halo */ |