diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
| commit | edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch) | |
| tree | f375d28043dd4457428a841167dc93d760ba9a46 /sound/pci/rme96.c | |
| parent | cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 (diff) | |
| parent | e17df688f7064dae1417ce425dd1e4b71d24d63b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/pci/rme96.c')
| -rw-r--r-- | sound/pci/rme96.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index 6c2a9f4a7659..3c1bc533d511 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
| @@ -232,7 +232,7 @@ struct rme96 { | |||
| 232 | struct snd_kcontrol *spdif_ctl; | 232 | struct snd_kcontrol *spdif_ctl; |
| 233 | }; | 233 | }; |
| 234 | 234 | ||
| 235 | static struct pci_device_id snd_rme96_ids[] = { | 235 | static struct pci_device_id snd_rme96_ids[] __devinitdata = { |
| 236 | { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96, | 236 | { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96, |
| 237 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, | 237 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, |
| 238 | { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96_8, | 238 | { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96_8, |