diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 06:38:49 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 06:38:49 -0500 |
| commit | 12c2a682b55a40f2a986e36d6632110029bc63a5 (patch) | |
| tree | ba21f049e4859411f6c135d597dc26260963ce7c /sound/pci/oxygen/oxygen.c | |
| parent | a86ba28583987b85845ed61be5f12aafb5fc4971 (diff) | |
| parent | aefbd3e823d4fe219bb6420b0cac505847270507 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index acbedebcffd9..289cb4dacfc7 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
| @@ -72,7 +72,7 @@ enum { | |||
| 72 | MODEL_CLARO_HALO, /* HT-Omega Claro halo */ | 72 | MODEL_CLARO_HALO, /* HT-Omega Claro halo */ |
| 73 | }; | 73 | }; |
| 74 | 74 | ||
| 75 | static struct pci_device_id oxygen_ids[] __devinitdata = { | 75 | static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = { |
| 76 | { OXYGEN_PCI_SUBID(0x10b0, 0x0216), .driver_data = MODEL_CMEDIA_REF }, | 76 | { OXYGEN_PCI_SUBID(0x10b0, 0x0216), .driver_data = MODEL_CMEDIA_REF }, |
| 77 | { OXYGEN_PCI_SUBID(0x10b0, 0x0218), .driver_data = MODEL_CMEDIA_REF }, | 77 | { OXYGEN_PCI_SUBID(0x10b0, 0x0218), .driver_data = MODEL_CMEDIA_REF }, |
| 78 | { OXYGEN_PCI_SUBID(0x10b0, 0x0219), .driver_data = MODEL_CMEDIA_REF }, | 78 | { OXYGEN_PCI_SUBID(0x10b0, 0x0219), .driver_data = MODEL_CMEDIA_REF }, |