summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorEliot Blennerhassett <eblennerhassett@audioscience.com>2011-07-22 15:53:00 +1200
committerTakashi Iwai <tiwai@suse.de>2011-07-22 07:53:45 +0200
commitc8306135746687b30048f8bd949d2dfb8d6c697a (patch)
treee08019695ed821632beeb69ee91ab7c13264e9e2 /sound
parent3d0591eee46f1c7cdfd502c8366e5552b8cea3db (diff)
downloadlinux-3.10-c8306135746687b30048f8bd949d2dfb8d6c697a.tar.gz
linux-3.10-c8306135746687b30048f8bd949d2dfb8d6c697a.tar.bz2
linux-3.10-c8306135746687b30048f8bd949d2dfb8d6c697a.zip
ALSA: asihpi - Control name updates
Add names corresponding to new HPI node types. Shorten some names so that constructed names don't overflow the maximum name length. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/asihpi/asihpi.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index 378656d7916..3444bd7d326 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -1330,10 +1330,12 @@ static const char * const asihpi_src_names[] = {
"RF",
"Clock",
"Bitstream",
- "Microphone",
- "Cobranet",
+ "Mic",
+ "Net",
"Analog",
"Adapter",
+ "RTP",
+ "GPI",
};
compile_time_assert(
@@ -1348,8 +1350,10 @@ static const char * const asihpi_dst_names[] = {
"Digital",
"RF",
"Speaker",
- "Cobranet Out",
- "Analog"
+ "Net",
+ "Analog",
+ "RTP",
+ "GPO",
};
compile_time_assert(