Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...

[safe/jmp/linux-2.6] / include / sound / ak4xxx-adda.h

diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
index 6153b91..030b87c 100644 (file)
--- a/include/sound/ak4xxx-adda.h
+++ b/include/sound/ak4xxx-adda.h
@@ -68,7 +68,7 @@ struct snd_akm4xxx {
        enum {
                SND_AK4524, SND_AK4528, SND_AK4529,
                SND_AK4355, SND_AK4358, SND_AK4381,
-               SND_AK5365, NON_AKM
+               SND_AK5365, SND_AK4620,
        } type;
 
        /* (array) information of combined codecs */
@@ -76,6 +76,9 @@ struct snd_akm4xxx {
        const struct snd_akm4xxx_adc_channel *adc_info;
 
        struct snd_ak4xxx_ops ops;
+       unsigned int num_chips;
+       unsigned int total_regs;
+       const char *name;
 };
 
 void snd_akm4xxx_write(struct snd_akm4xxx *ak, int chip, unsigned char reg,