diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /sound/pci/cs4281.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'sound/pci/cs4281.c')
| -rw-r--r-- | sound/pci/cs4281.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index d1802487f5be..9631456ec3de 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
| @@ -494,7 +494,7 @@ struct cs4281 { | |||
| 494 | 494 | ||
| 495 | static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 495 | static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id, struct pt_regs *regs); |
| 496 | 496 | ||
| 497 | static struct pci_device_id snd_cs4281_ids[] __devinitdata = { | 497 | static struct pci_device_id snd_cs4281_ids[] = { |
| 498 | { 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */ | 498 | { 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */ |
| 499 | { 0, } | 499 | { 0, } |
| 500 | }; | 500 | }; |