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/oss/kahlua.c | |
| parent | a86ba28583987b85845ed61be5f12aafb5fc4971 (diff) | |
| parent | aefbd3e823d4fe219bb6420b0cac505847270507 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/oss/kahlua.c')
| -rw-r--r-- | sound/oss/kahlua.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c index 89466b056be7..24d152ccf80d 100644 --- a/sound/oss/kahlua.c +++ b/sound/oss/kahlua.c | |||
| @@ -198,7 +198,7 @@ MODULE_LICENSE("GPL"); | |||
| 198 | * 5530 only. The 5510/5520 decode is different. | 198 | * 5530 only. The 5510/5520 decode is different. |
| 199 | */ | 199 | */ |
| 200 | 200 | ||
| 201 | static struct pci_device_id id_tbl[] = { | 201 | static DEFINE_PCI_DEVICE_TABLE(id_tbl) = { |
| 202 | { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 }, | 202 | { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 }, |
| 203 | { } | 203 | { } |
| 204 | }; | 204 | }; |