Merge remote-tracking branches 'asoc/topic/cs47l24', 'asoc/topic/cx20442', 'asoc...

[sfrench/cifs-2.6.git] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index ed8093ff8572f8e55fd9bd24785c1bc8354ac08d..747fd583b9dcf2afeb75e81de56a8ad6cc604507 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -863,12 +863,10 @@ struct snd_soc_component {
        struct list_head card_aux_list; /* for auxiliary bound components */
        struct list_head card_list;
 
        struct list_head card_aux_list; /* for auxiliary bound components */
        struct list_head card_list;
 

-       struct snd_soc_dai_driver *dai_drv;
-       int num_dai;
-

        const struct snd_soc_component_driver *driver;
 
        struct list_head dai_list;
        const struct snd_soc_component_driver *driver;
 
        struct list_head dai_list;

+       int num_dai;

 
        int (*read)(struct snd_soc_component *, unsigned int, unsigned int *);
        int (*write)(struct snd_soc_component *, unsigned int, unsigned int);
 
        int (*read)(struct snd_soc_component *, unsigned int, unsigned int *);
        int (*write)(struct snd_soc_component *, unsigned int, unsigned int);