diff options
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/soc.h | 4 | ||||
-rw-r--r-- | include/sound/version.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index b1dc364b8f74..db6edba8ef08 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <sound/control.h> | 22 | #include <sound/control.h> |
23 | #include <sound/ac97_codec.h> | 23 | #include <sound/ac97_codec.h> |
24 | 24 | ||
25 | #define SND_SOC_VERSION "0.13.0" | 25 | #define SND_SOC_VERSION "0.13.1" |
26 | 26 | ||
27 | /* | 27 | /* |
28 | * Convenience kcontrol builders | 28 | * Convenience kcontrol builders |
@@ -83,6 +83,7 @@ | |||
83 | #define SND_SOC_DAI_AC97 0x1 | 83 | #define SND_SOC_DAI_AC97 0x1 |
84 | #define SND_SOC_DAI_I2S 0x2 | 84 | #define SND_SOC_DAI_I2S 0x2 |
85 | #define SND_SOC_DAI_PCM 0x4 | 85 | #define SND_SOC_DAI_PCM 0x4 |
86 | #define SND_SOC_DAI_AC97_BUS 0x8 /* for custom i.e. non ac97_codec.c */ | ||
86 | 87 | ||
87 | /* | 88 | /* |
88 | * DAI hardware audio formats | 89 | * DAI hardware audio formats |
@@ -278,6 +279,7 @@ struct snd_soc_cpu_ops { | |||
278 | struct snd_soc_codec_dai { | 279 | struct snd_soc_codec_dai { |
279 | char *name; | 280 | char *name; |
280 | int id; | 281 | int id; |
282 | unsigned char type; | ||
281 | 283 | ||
282 | /* DAI capabilities */ | 284 | /* DAI capabilities */ |
283 | struct snd_soc_pcm_stream playback; | 285 | struct snd_soc_pcm_stream playback; |
diff --git a/include/sound/version.h b/include/sound/version.h index e820f0e7bdd3..50ee4fd420fa 100644 --- a/include/sound/version.h +++ b/include/sound/version.h | |||
@@ -1,3 +1,3 @@ | |||
1 | /* include/version.h. Generated by alsa/ksync script. */ | 1 | /* include/version.h. Generated by alsa/ksync script. */ |
2 | #define CONFIG_SND_VERSION "1.0.14rc4" | 2 | #define CONFIG_SND_VERSION "1.0.14rc4" |
3 | #define CONFIG_SND_DATE " (Wed May 09 09:51:39 2007 UTC)" | 3 | #define CONFIG_SND_DATE " (Wed May 16 09:45:46 2007 UTC)" |