Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus

This commit is contained in:
Takashi Iwai 2009-12-15 10:29:06 +01:00
commit 709334c87d
6459 changed files with 598239 additions and 343777 deletions

View file

@ -177,7 +177,7 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = {
{ .id = "CSC0437", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } },
/* Digital PC 5000 Onboard - CS4236B */
{ .id = "CSC0735", .devs = { { "CSC0000" }, { "CSC0010" } } },
/* some uknown CS4236B */
/* some unknown CS4236B */
{ .id = "CSC0b35", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } },
/* Intel PR440FX Onboard sound */
{ .id = "CSC0b36", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } },

View file

@ -133,7 +133,7 @@ struct snd_miro {
static struct snd_miro_aci aci_device;
static char * snd_opti9xx_names[] = {
"unkown",
"unknown",
"82C928", "82C929",
"82C924", "82C925",
"82C930", "82C931", "82C933"

View file

@ -179,7 +179,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids);
#endif
static char * snd_opti9xx_names[] = {
"unkown",
"unknown",
"82C928", "82C929",
"82C924", "82C925",
"82C930", "82C931", "82C933"