diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 06:38:49 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 06:38:49 -0500 |
commit | 12c2a682b55a40f2a986e36d6632110029bc63a5 (patch) | |
tree | ba21f049e4859411f6c135d597dc26260963ce7c /sound/pci/via82xx.c | |
parent | a86ba28583987b85845ed61be5f12aafb5fc4971 (diff) | |
parent | aefbd3e823d4fe219bb6420b0cac505847270507 (diff) |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/via82xx.c')
-rw-r--r-- | sound/pci/via82xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 03d6aea19749..7e494b6a1d0e 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
@@ -401,7 +401,7 @@ struct via82xx { | |||
401 | #endif | 401 | #endif |
402 | }; | 402 | }; |
403 | 403 | ||
404 | static struct pci_device_id snd_via82xx_ids[] = { | 404 | static DEFINE_PCI_DEVICE_TABLE(snd_via82xx_ids) = { |
405 | /* 0x1106, 0x3058 */ | 405 | /* 0x1106, 0x3058 */ |
406 | { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686_5), TYPE_CARD_VIA686, }, /* 686A */ | 406 | { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686_5), TYPE_CARD_VIA686, }, /* 686A */ |
407 | /* 0x1106, 0x3059 */ | 407 | /* 0x1106, 0x3059 */ |