[ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

[net-next-2.6.git] / include / sound / ak4xxx-adda.h

diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
index d0deca669b92fe7cc96e856d6f9dbbcdbcf24ce9..891cf1aea8b139db918705149a9e7ffb25760fd5 100644 (file)
--- a/include/sound/ak4xxx-adda.h
+++ b/include/sound/ak4xxx-adda.h
@@ -5,7 +5,7 @@
  *   ALSA driver for AK4524 / AK4528 / AK4529 / AK4355 / AK4381
  *   AD and DA converters
  *
- *     Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *     Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -43,6 +43,7 @@ struct snd_ak4xxx_ops {
 struct snd_akm4xxx_dac_channel {
        char *name;             /* mixer volume name */
        unsigned int num_channels;
+       char *switch_name;              /* mixer switch*/
 };
 
 /* ADC labels and channels */
@@ -50,6 +51,8 @@ struct snd_akm4xxx_adc_channel {
        char *name;             /* capture gain volume label */
        char *switch_name;      /* capture switch */
        unsigned int num_channels;
+       char *selector_name;    /* capture source select label */
+       const char **input_names; /* capture source names (NULL terminated) */
 };
 
 struct snd_akm4xxx {
@@ -69,8 +72,8 @@ struct snd_akm4xxx {
        } type;
 
        /* (array) information of combined codecs */
-       struct snd_akm4xxx_dac_channel *dac_info;
-       struct snd_akm4xxx_adc_channel *adc_info;
+       const struct snd_akm4xxx_dac_channel *dac_info;
+       const struct snd_akm4xxx_adc_channel *adc_info;
 
        struct snd_ak4xxx_ops ops;
 };