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/cs5530.c | |
| parent | ad6cfc2ac71180171e090e69ae8762ac511884b1 (diff) | |
| parent | 89c0ac7cab2440a771ba1e2ab953186bc9c29786 (diff) | |
Merge branch 'topic/misc' into fix/misc
Diffstat (limited to 'sound/pci/cs5530.c')
| -rw-r--r-- | sound/pci/cs5530.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c index dc464321d0f3..207479a641cf 100644 --- a/sound/pci/cs5530.c +++ b/sound/pci/cs5530.c | |||
| @@ -58,7 +58,7 @@ struct snd_cs5530 { | |||
| 58 | unsigned long pci_base; | 58 | unsigned long pci_base; |
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | static struct pci_device_id snd_cs5530_ids[] = { | 61 | static DEFINE_PCI_DEVICE_TABLE(snd_cs5530_ids) = { |
| 62 | {PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID, | 62 | {PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID, |
| 63 | PCI_ANY_ID, 0, 0}, | 63 | PCI_ANY_ID, 0, 0}, |
| 64 | {0,} | 64 | {0,} |