diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-16 21:21:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-16 21:21:33 -0700 |
| commit | b17bfca5f16a6090ee51250163e1720f6fe71515 (patch) | |
| tree | b5c561e1c2b7db6ded4c2092486f66f7c8c35902 /include | |
| parent | 36dbe4d6bffb90fcb2663ac50af00a942412e246 (diff) | |
| parent | a04395ead6d17c83da64264b6fe78f852a648202 (diff) | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] usbaudio - Coping with short replies in usbmixer
[ALSA] Include quirks from Ubuntu Dapper/Edgy/Feisty
[ALSA] Fix probe of non-PnP ISA devices
[ALSA] version 1.0.14rc4
[ALSA] hda-codec - Fix ALC882/861VD codec support on some laptops
[ALSA] ASoC AC97 device reg bugfix
[ALSA] ASoC AC97 static GPL symbol fix
[ALSA] hda-codec - Make the mixer capability check more robust
[ALSA] usb-audio: another Logitech QuickCam ID
Diffstat (limited to 'include')
| -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 b1dc364b8f7..db6edba8ef0 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -22,7 +22,7 @@ #include <sound/control.h> #include <sound/ac97_codec.h> -#define SND_SOC_VERSION "0.13.0" +#define SND_SOC_VERSION "0.13.1" /* * Convenience kcontrol builders @@ -83,6 +83,7 @@ #define SND_SOC_DAI_AC97 0x1 #define SND_SOC_DAI_I2S 0x2 #define SND_SOC_DAI_PCM 0x4 +#define SND_SOC_DAI_AC97_BUS 0x8 /* for custom i.e. non ac97_codec.c */ /* * DAI hardware audio formats @@ -278,6 +279,7 @@ struct snd_soc_cpu_ops { struct snd_soc_codec_dai { char *name; int id; + unsigned char type; /* DAI capabilities */ struct snd_soc_pcm_stream playback; diff --git a/include/sound/version.h b/include/sound/version.h index e820f0e7bdd..50ee4fd420f 100644 --- a/include/sound/version.h +++ b/include/sound/version.h @@ -1,3 +1,3 @@ /* include/version.h. Generated by alsa/ksync script. */ #define CONFIG_SND_VERSION "1.0.14rc4" -#define CONFIG_SND_DATE " (Wed May 09 09:51:39 2007 UTC)" +#define CONFIG_SND_DATE " (Wed May 16 09:45:46 2007 UTC)" |