diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /sound/pci/es1938.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'sound/pci/es1938.c')
| -rw-r--r-- | sound/pci/es1938.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 1113b10259cf..cc0f34f68185 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
| @@ -242,7 +242,7 @@ struct es1938 { | |||
| 242 | 242 | ||
| 243 | static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 243 | static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *regs); |
| 244 | 244 | ||
| 245 | static struct pci_device_id snd_es1938_ids[] __devinitdata = { | 245 | static struct pci_device_id snd_es1938_ids[] = { |
| 246 | { 0x125d, 0x1969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Solo-1 */ | 246 | { 0x125d, 0x1969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Solo-1 */ |
| 247 | { 0, } | 247 | { 0, } |
| 248 | }; | 248 | }; |