From 4950a17987552bdf275aff4cee44b6f994176c71 Mon Sep 17 00:00:00 2001 From: Ben Stanley Date: Fri, 12 Dec 2008 09:47:13 +1100 Subject: [PATCH] --- yaml --- r: 120363 b: refs/heads/master c: f649a7145b8b67121e8be0b50f7861755f21aa3b h: refs/heads/master i: 120361: b2ea620a83c745549d9fcfe994b492da5550b4e4 120359: 0aad94348faca0beb92b6e948978e21a5b38af1c v: v3 --- [refs] | 2 +- trunk/sound/pci/ca0106/ca0106.h | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 76dbe2134d4f..ff94e209d8e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42a73df435a23e60d97d9d860f4e55dc9833e950 +refs/heads/master: f649a7145b8b67121e8be0b50f7861755f21aa3b diff --git a/trunk/sound/pci/ca0106/ca0106.h b/trunk/sound/pci/ca0106/ca0106.h index 74175fc80c7f..3faccb6ecad9 100644 --- a/trunk/sound/pci/ca0106/ca0106.h +++ b/trunk/sound/pci/ca0106/ca0106.h @@ -664,10 +664,14 @@ struct snd_ca0106_pcm { struct snd_ca0106_details { u32 serial; char * name; - int ac97; - int gpio_type; - int i2c_adc; - int spi_dac; + int ac97; /* ac97 = 0 -> Select MIC, Line in, TAD in, AUX in. + ac97 = 1 -> Default to AC97 in. */ + int gpio_type; /* gpio_type = 1 -> shared mic-in/line-in + gpio_type = 2 -> shared side-out/line-in. */ + int i2c_adc; /* with i2c_adc=1, the driver adds some capture volume + controls, phone, mic, line-in and aux. */ + int spi_dac; /* spi_dac=1 adds the mute switch for each analog + output, front, rear, etc. */ }; // definition of the chip-specific record