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/sonicvibes.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'sound/pci/sonicvibes.c')
| -rw-r--r-- | sound/pci/sonicvibes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index c4303418668b..e5d4def1aa6f 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c | |||
| @@ -243,7 +243,7 @@ struct sonicvibes { | |||
| 243 | #endif | 243 | #endif |
| 244 | }; | 244 | }; |
| 245 | 245 | ||
| 246 | static struct pci_device_id snd_sonic_ids[] __devinitdata = { | 246 | static struct pci_device_id snd_sonic_ids[] = { |
| 247 | { 0x5333, 0xca00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, | 247 | { 0x5333, 0xca00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, |
| 248 | { 0, } | 248 | { 0, } |
| 249 | }; | 249 | }; |