summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-24 00:35:58 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-24 00:35:58 +0100
commit87cd9d7c8501e5da79de542340208b5f6ab4e1a4 (patch)
treebc19698988f30dfd0d5683bab0173ad581d8bb2d /sound
parent158c1529fe8d0094d0051169fd2b1a23e6305223 (diff)
parentdd542f169aaa35f4ac0d063e04b41c648a93887c (diff)
downloadlinux-87cd9d7c8501e5da79de542340208b5f6ab4e1a4.tar.bz2
Merge branch 'topic/ca0106' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ca0106/ca0106_main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index a38ff9dd07eb..df757575798a 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -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".