Merge branch 'topic/ca0106' into for-linus

This commit is contained in:
Takashi Iwai 2009-03-24 00:35:58 +01:00
commit 87cd9d7c85

View file

@ -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".