diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-10-24 07:41:03 -0500 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-10-24 07:41:03 -0500 |
| commit | 211e9ff0454602ea092135f477e5c472a8f0aa99 (patch) | |
| tree | 342f76f77bc1e02704c76888d55c7ecff2b648d9 /include/video | |
| parent | 00fd50e342cb085dbab41ea525973920dfd61e61 (diff) | |
| parent | 3974bebcea6efce02c75482c3a868c35e38956e4 (diff) | |
| download | kernel_samsung_espresso10-211e9ff0454602ea092135f477e5c472a8f0aa99.zip kernel_samsung_espresso10-211e9ff0454602ea092135f477e5c472a8f0aa99.tar.gz kernel_samsung_espresso10-211e9ff0454602ea092135f477e5c472a8f0aa99.tar.bz2 | |
Merge branch 'android-omap-3.0' into p-android-omap-3.0
* android-omap-3.0:
OMAP4: HDCP: Fix crash on cancel_delayed_work
OMAP4: HDMI: Audio: poll HDMI display before returning error
OMAP4: HDMI: Check AKSV registers before resetting HDMI Wrapper
Change-Id: I42af064593ddecbcf93f948b3f7816240ba9bd3e
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/hdmi_ti_4xxx_ip.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/video/hdmi_ti_4xxx_ip.h b/include/video/hdmi_ti_4xxx_ip.h index 992c704..a1224a4 100644 --- a/include/video/hdmi_ti_4xxx_ip.h +++ b/include/video/hdmi_ti_4xxx_ip.h @@ -382,4 +382,5 @@ void hdmi_ti_4xxx_core_audio_infoframe_config(struct hdmi_ip_data *ip_data, struct hdmi_core_infoframe_audio *info_aud); void hdmi_ti_4xxx_audio_enable(struct hdmi_ip_data *ip_data, bool idle); int hdmi_ti_4xxx_set_wait_soft_reset(struct hdmi_ip_data *ip_data); +bool hdmi_ti_4xx_check_aksv_data(struct hdmi_ip_data *ip_data); #endif |