diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2011-01-10 15:17:26 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 15:46:42 (GMT) |
| commit | 8443d2eb81e30dcc027e531eaa442cdb2477c5ab (patch) | |
| tree | 558571ef07c0ed287fbe6d8b274ccbf814c044ef /sound | |
| parent | 8c50b75979a198194a38d38d855f9d7e9cac2889 (diff) | |
| download | linux-8443d2eb81e30dcc027e531eaa442cdb2477c5ab.tar.xz | |
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')
| -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 7b2678a..ddb5e69 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -218,6 +218,7 @@ config SND_OXYGEN C-Media CMI8788 (Oxygen HD Audio) chip: * Asound A-8788 * AuzenTech X-Meridian + * AuzenTech X-Meridian 2G * Bgears b-Enspirer * Club3D Theatron DTS * HT-Omega Claro (plus) diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index e187c95..304f1a5 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c @@ -102,6 +102,8 @@ static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = { { OXYGEN_PCI_SUBID(0x14c3, 0x1711), .driver_data = MODEL_2CH_OUTPUT }, /* AuzenTech X-Meridian */ { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN }, + /* AuzenTech X-Meridian 2G */ + { OXYGEN_PCI_SUBID(0x5431, 0x017a), .driver_data = MODEL_MERIDIAN }, /* HT-Omega Claro */ { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CLARO }, /* HT-Omega Claro halo */ |