summaryrefslogtreecommitdiffstats
path: root/sound/pci/rme32.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-07-17 15:25:26 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2006-07-17 15:25:26 +0200
commit4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch)
tree9d19a2774e83637d86dc876f3af22af1dacf0bec /sound/pci/rme32.c
parent[DLM] dlm: user locks (diff)
parentLinux 2.6.18-rc2 (diff)
downloadlinux-4bf311ddfbffe12d41ad1a3c311ab727db6f72cb.tar.xz
linux-4bf311ddfbffe12d41ad1a3c311ab727db6f72cb.zip
Merge branch 'master'
Diffstat (limited to 'sound/pci/rme32.c')
-rw-r--r--sound/pci/rme32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 2e24b68d07aa..2a71499242fa 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -227,7 +227,7 @@ struct rme32 {
struct snd_kcontrol *spdif_ctl;
};
-static struct pci_device_id snd_rme32_ids[] __devinitdata = {
+static struct pci_device_id snd_rme32_ids[] = {
{PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_RME_DIGI32,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
{PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_8,