mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
This commit is contained in:
commit
709334c87d
6459 changed files with 598239 additions and 343777 deletions
|
|
@ -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" } } },
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in a new issue