diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 09:09:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 09:09:56 -0700 |
| commit | 88e366217e8f75bd7eab64f4aa4ff9583070b0af (patch) | |
| tree | efa9d084f98749a35555afd9898b92d51d3755d2 /sound/ppc/snd_ps3.h | |
| parent | a1cf64944f6f2ffe5ef30a0ee4d529db771f7db2 (diff) | |
| parent | 975f6b0c1b0efb66db455d2e76bacba06cc65541 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ASoC: OMAP: Fix DSP DAI format in McBSP DAI driver
go7007 - Add missing dependency on sound subsystem
ALSA: ps3: Add support for SPDIF/HDMI passthru
ps3: Add passthru support for non-audio streams
ps3: Add ps3av_audio_mute_analog()
ALSA: misc typo fixes
sound: add missing pcm kernel-doc
Diffstat (limited to 'sound/ppc/snd_ps3.h')
| -rw-r--r-- | sound/ppc/snd_ps3.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/ppc/snd_ps3.h b/sound/ppc/snd_ps3.h index 4b7e6fbbe50..326fb29e82d 100644 --- a/sound/ppc/snd_ps3.h +++ b/sound/ppc/snd_ps3.h @@ -51,6 +51,7 @@ struct snd_ps3_avsetting_info { uint32_t avs_audio_width; uint32_t avs_audio_format; /* fixed */ uint32_t avs_audio_source; /* fixed */ + unsigned char avs_cs_info[8]; }; /* * PS3 audio 'card' instance |