Skip to content

Commit

Permalink
Merge branch 'topic/ca0106' into for-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Takashi Iwai committed Mar 23, 2009
2 parents 158c152 + dd542f1 commit 87cd9d7
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions sound/pci/ca0106/ca0106_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,14 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
.gpio_type = 2,
.i2c_adc = 1,
.spi_dac = 1 } ,
/* Giga-byte GA-G1975X mobo
* Novell bnc#395807
*/
/* FIXME: the GPIO and I2C setting aren't tested well */
{ .serial = 0x1458a006,
.name = "Giga-byte GA-G1975X",
.gpio_type = 1,
.i2c_adc = 1 },
/* Shuttle XPC SD31P which has an onboard Creative Labs
* Sound Blaster Live! 24-bit EAX
* high-definition 7.1 audio processor".
Expand Down

0 comments on commit 87cd9d7

Please sign in to comment.