diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-08 15:58:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-08 15:58:25 +0100 |
| commit | 17a4adbe68c8e6c1fde8decb2345dc4acea87934 (patch) | |
| tree | 16d772ee8b5904ad9b92e1514e131bc504a079ae /sound/pci/hda/hda_intel.c | |
| parent | c9adeefda0e29bed628e40e7f9da1f84243937e7 (diff) | |
| parent | 8bb4d9ce08b0a92ca174e41d92c180328f86173f (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index bffaaeb0b4ba..2cc07c184d31 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -3683,6 +3683,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { /* Teradici */ { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT }, + { PCI_DEVICE(0x6549, 0x2200), + .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT }, /* Creative X-Fi (CA0110-IBG) */ /* CTHDA chips */ { PCI_DEVICE(0x1102, 0x0010), |