diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:43 +0000 |
| commit | 6ee00c164e2d1ab8f88e5c461b494bbb40efe0ba (patch) | |
| tree | c17f517d7ab719d30bff6b14b20b00a5787c7593 /include/sound | |
| parent | 2944c2f5d5c88d5893d6a1dad51d0768aed52d00 (diff) | |
| parent | a4a2992c531f6ca0aa00ce0deb31e51c1b7ae69b (diff) | |
Merge remote-tracking branch 'asoc/topic/simple-card' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/simple_card.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h index 4b62b8dc6a4..6c74527d492 100644 --- a/include/sound/simple_card.h +++ b/include/sound/simple_card.h @@ -14,21 +14,21 @@ #include <sound/soc.h> -struct asoc_simple_dai_init_info { +struct asoc_simple_dai { + const char *name; unsigned int fmt; - unsigned int cpu_daifmt; - unsigned int codec_daifmt; unsigned int sysclk; }; struct asoc_simple_card_info { const char *name; const char *card; - const char *cpu_dai; const char *codec; const char *platform; - const char *codec_dai; - struct asoc_simple_dai_init_info *init; /* for snd_link.init */ + + 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; |