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/riptide/riptide.c | |
| parent | a86ba28583987b85845ed61be5f12aafb5fc4971 (diff) | |
| parent | aefbd3e823d4fe219bb6420b0cac505847270507 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/riptide/riptide.c')
| -rw-r--r-- | sound/pci/riptide/riptide.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index e66ef2b69b5d..960a227eb653 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
| @@ -506,7 +506,7 @@ static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip); | |||
| 506 | /* | 506 | /* |
| 507 | */ | 507 | */ |
| 508 | 508 | ||
| 509 | static struct pci_device_id snd_riptide_ids[] = { | 509 | static DEFINE_PCI_DEVICE_TABLE(snd_riptide_ids) = { |
| 510 | { PCI_DEVICE(0x127a, 0x4310) }, | 510 | { PCI_DEVICE(0x127a, 0x4310) }, |
| 511 | { PCI_DEVICE(0x127a, 0x4320) }, | 511 | { PCI_DEVICE(0x127a, 0x4320) }, |
| 512 | { PCI_DEVICE(0x127a, 0x4330) }, | 512 | { PCI_DEVICE(0x127a, 0x4330) }, |
| @@ -515,7 +515,7 @@ static struct pci_device_id snd_riptide_ids[] = { | |||
| 515 | }; | 515 | }; |
| 516 | 516 | ||
| 517 | #ifdef SUPPORT_JOYSTICK | 517 | #ifdef SUPPORT_JOYSTICK |
| 518 | static struct pci_device_id snd_riptide_joystick_ids[] __devinitdata = { | 518 | static DEFINE_PCI_DEVICE_TABLE(snd_riptide_joystick_ids) = { |
| 519 | { PCI_DEVICE(0x127a, 0x4312) }, | 519 | { PCI_DEVICE(0x127a, 0x4312) }, |
| 520 | { PCI_DEVICE(0x127a, 0x4322) }, | 520 | { PCI_DEVICE(0x127a, 0x4322) }, |
| 521 | { PCI_DEVICE(0x127a, 0x4332) }, | 521 | { PCI_DEVICE(0x127a, 0x4332) }, |