diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-16 02:50:49 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-16 02:50:49 -0400 |
| commit | a9104f989916aac5d92bfa2c51915d5985fb2e6c (patch) | |
| tree | 17bef4eac561e3ac90d98d68190978e686712b67 /sound/pci/atiixp_modem.c | |
| parent | ad6cfc2ac71180171e090e69ae8762ac511884b1 (diff) | |
| parent | 89c0ac7cab2440a771ba1e2ab953186bc9c29786 (diff) | |
Merge branch 'topic/misc' into fix/misc
Diffstat (limited to 'sound/pci/atiixp_modem.c')
| -rw-r--r-- | sound/pci/atiixp_modem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index e7e147bf8eb2..91d7036b6411 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c | |||
| @@ -261,7 +261,7 @@ struct atiixp_modem { | |||
| 261 | 261 | ||
| 262 | /* | 262 | /* |
| 263 | */ | 263 | */ |
| 264 | static struct pci_device_id snd_atiixp_ids[] = { | 264 | static DEFINE_PCI_DEVICE_TABLE(snd_atiixp_ids) = { |
| 265 | { PCI_VDEVICE(ATI, 0x434d), 0 }, /* SB200 */ | 265 | { PCI_VDEVICE(ATI, 0x434d), 0 }, /* SB200 */ |
| 266 | { PCI_VDEVICE(ATI, 0x4378), 0 }, /* SB400 */ | 266 | { PCI_VDEVICE(ATI, 0x4378), 0 }, /* SB400 */ |
| 267 | { 0, } | 267 | { 0, } |