aboutsummaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:37 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:37 +0200
commit8c3ff3a7fb9730564554bb65d54455e6ce8ad340 (patch)
treee21bbdab8537678b85f9661ceb89f09989a9935b /sound/pci
parented8cc176c9d3f8fbc2ddc18b75362be666e6d328 (diff)
parentad0b0822f98ef547e2461ce463e4233bad7848a8 (diff)
Merge branch 'topic/misc' into for-linus
* topic/misc: ALSA: sgio2audio.c: clean up checking ALSA: burgundy: timeout message is off by one. ALSA: bt87x - Add a quirk entry for Askey Computer Corp. MagicTView'99 ALSA: parisc/harmony: fix printk format warning ALSA: keywest: Get rid of useless i2c_device_name() macro
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/bt87x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index ce3f2e90f4d..24585c6c6d0 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -810,6 +810,8 @@ static struct pci_device_id snd_bt87x_ids[] = {
BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, GENERIC),
/* Voodoo TV 200 */
BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x121a, 0x3000, GENERIC),
+ /* Askey Computer Corp. MagicTView'99 */
+ BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x144f, 0x3000, GENERIC),
/* AVerMedia Studio No. 103, 203, ...? */
BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, AVPHONE98),
/* Prolink PixelView PV-M4900 */