Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm...

[pandora-kernel.git] / include / drm / drm_edid.h

diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 7b75621..a1441c5 100644 (file)
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -260,6 +260,7 @@ struct hdmi_vendor_infoframe;
 
 void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid);
 int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads);
+int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb);
 int drm_av_sync_delay(struct drm_connector *connector,
                      struct drm_display_mode *mode);
 struct drm_connector *drm_select_eld(struct drm_encoder *encoder,