summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 09:09:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 09:09:56 -0700
commit88e366217e8f75bd7eab64f4aa4ff9583070b0af (patch)
treeefa9d084f98749a35555afd9898b92d51d3755d2 /arch
parenta1cf64944f6f2ffe5ef30a0ee4d529db771f7db2 (diff)
parent975f6b0c1b0efb66db455d2e76bacba06cc65541 (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 'arch')
-rw-r--r--arch/powerpc/include/asm/ps3av.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/ps3av.h b/arch/powerpc/include/asm/ps3av.h
index fda98715cd35..5aa22cffdbd6 100644
--- a/arch/powerpc/include/asm/ps3av.h
+++ b/arch/powerpc/include/asm/ps3av.h
@@ -678,6 +678,8 @@ struct ps3av_pkt_avb_param {
u8 buf[PS3AV_PKT_AVB_PARAM_MAX_BUF_SIZE];
};
+/* channel status */
+extern u8 ps3av_mode_cs_info[];
/** command status **/
#define PS3AV_STATUS_SUCCESS 0x0000 /* success */
@@ -735,6 +737,7 @@ extern int ps3av_get_mode(void);
extern int ps3av_video_mode2res(u32, u32 *, u32 *);
extern int ps3av_video_mute(int);
extern int ps3av_audio_mute(int);
+extern int ps3av_audio_mute_analog(int);
extern int ps3av_dev_open(void);
extern int ps3av_dev_close(void);
extern void ps3av_register_flip_ctl(void (*flip_ctl)(int on, void *data),