diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /sound/isa/opti9xx/opti92x-ad1848.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'sound/isa/opti9xx/opti92x-ad1848.c')
| -rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 5cd555325b9d..848007508ffd 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
| @@ -185,7 +185,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids); | |||
| 185 | #endif | 185 | #endif |
| 186 | 186 | ||
| 187 | static char * snd_opti9xx_names[] = { | 187 | static char * snd_opti9xx_names[] = { |
| 188 | "unkown", | 188 | "unknown", |
| 189 | "82C928", "82C929", | 189 | "82C928", "82C929", |
| 190 | "82C924", "82C925", | 190 | "82C924", "82C925", |
| 191 | "82C930", "82C931", "82C933" | 191 | "82C930", "82C931", "82C933" |