diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
tree | 5861a45f70c1f283720337abd864498f5afb3dbe /sound/isa | |
parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/cs423x/cs4236.c | 2 | ||||
-rw-r--r-- | sound/isa/opti9xx/miro.c | 2 | ||||
-rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 93fa6720d197..cc15d1d65a22 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c | |||
@@ -177,7 +177,7 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = { | |||
177 | { .id = "CSC0437", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, | 177 | { .id = "CSC0437", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, |
178 | /* Digital PC 5000 Onboard - CS4236B */ | 178 | /* Digital PC 5000 Onboard - CS4236B */ |
179 | { .id = "CSC0735", .devs = { { "CSC0000" }, { "CSC0010" } } }, | 179 | { .id = "CSC0735", .devs = { { "CSC0000" }, { "CSC0010" } } }, |
180 | /* some uknown CS4236B */ | 180 | /* some unknown CS4236B */ |
181 | { .id = "CSC0b35", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, | 181 | { .id = "CSC0b35", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, |
182 | /* Intel PR440FX Onboard sound */ | 182 | /* Intel PR440FX Onboard sound */ |
183 | { .id = "CSC0b36", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, | 183 | { .id = "CSC0b36", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, |
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index 6123c7531110..b865e45a8f9b 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c | |||
@@ -133,7 +133,7 @@ struct snd_miro { | |||
133 | static struct snd_miro_aci aci_device; | 133 | static struct snd_miro_aci aci_device; |
134 | 134 | ||
135 | static char * snd_opti9xx_names[] = { | 135 | static char * snd_opti9xx_names[] = { |
136 | "unkown", | 136 | "unknown", |
137 | "82C928", "82C929", | 137 | "82C928", "82C929", |
138 | "82C924", "82C925", | 138 | "82C924", "82C925", |
139 | "82C930", "82C931", "82C933" | 139 | "82C930", "82C931", "82C933" |
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index d8eac3f28947..c8a8da0d4036 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
@@ -179,7 +179,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids); | |||
179 | #endif | 179 | #endif |
180 | 180 | ||
181 | static char * snd_opti9xx_names[] = { | 181 | static char * snd_opti9xx_names[] = { |
182 | "unkown", | 182 | "unknown", |
183 | "82C928", "82C929", | 183 | "82C928", "82C929", |
184 | "82C924", "82C925", | 184 | "82C924", "82C925", |
185 | "82C930", "82C931", "82C933" | 185 | "82C930", "82C931", "82C933" |