From 4cb26064cdaad23649f9f03e150725ea07137faf Mon Sep 17 00:00:00 2001 From: James Courtier-Dutton Date: Sat, 11 Nov 2006 10:52:06 +0000 Subject: [PATCH] --- yaml --- r: 47103 b: refs/heads/master c: e6327cf90b1e5e849ac87fbdaee7822a64b6ff56 h: refs/heads/master i: 47101: e3aafd25cddf1fef7583fe17a14e890ddc009cf2 47099: ed937ec209f4550cad287dcdc22d7920ee3c35be 47095: 1d1663a9a10a0325308413a7086002f842bf5542 47087: 92867c986e290dde9f079f8ce4bc27d728895074 47071: 42787668ec467f7572474c2302452ce690cd41ae 47039: 46b0915e5271293ec17535593bcf41379882029b 46975: 78f825a8152d994f2beab0eff88012cd57aab3fa 46847: 8e3d81e956d25d0060afdf9b0faf2f17c013318b 46591: 94c827bc88c274ae3cd75c4e84ace59f52d3fa6a 46079: a05d72002dc73f8b659b2f85f77829a36e0a9827 45055: dc1301f5a6cc3b4a27080b5c73daa03b54721a0d v: v3 --- [refs] | 2 +- trunk/sound/pci/ca0106/ca0106_mixer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 756ced659ced..7ba3b295e614 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c07c81832a9303eeb36afb8f76ad0594e66cf5e +refs/heads/master: e6327cf90b1e5e849ac87fbdaee7822a64b6ff56 diff --git a/trunk/sound/pci/ca0106/ca0106_mixer.c b/trunk/sound/pci/ca0106/ca0106_mixer.c index 9855f528ea78..bd2a054c673b 100644 --- a/trunk/sound/pci/ca0106/ca0106_mixer.c +++ b/trunk/sound/pci/ca0106/ca0106_mixer.c @@ -539,14 +539,14 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = { }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Digital Capture Source", + .name = "Digital Source Capture Enum", .info = snd_ca0106_capture_source_info, .get = snd_ca0106_capture_source_get, .put = snd_ca0106_capture_source_put }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Capture Source", + .name = "Analog Source Capture Enum", .info = snd_ca0106_i2c_capture_source_info, .get = snd_ca0106_i2c_capture_source_get, .put = snd_ca0106_i2c_capture_source_put