Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / sound / simple_card.h

diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h
index 6c74527..9b0ac77 100644 (file)
--- a/include/sound/simple_card.h
+++ b/include/sound/simple_card.h
@@ -18,6 +18,8 @@ struct asoc_simple_dai {
        const char *name;
        unsigned int fmt;
        unsigned int sysclk;
+       int slots;
+       int slot_width;
 };
 
 struct asoc_simple_card_info {
@@ -29,10 +31,6 @@ struct asoc_simple_card_info {
        unsigned int daifmt;
        struct asoc_simple_dai cpu_dai;
        struct asoc_simple_dai codec_dai;
-
-       /* used in simple-card.c */
-       struct snd_soc_dai_link snd_link;
-       struct snd_soc_card snd_card;
 };
 
 #endif /* __SIMPLE_CARD_H */