Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next

[~andy/linux] / drivers / video / omap2 / dss / dss.h

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 2acc6615b984a69efdbb79bf907e9dbbade40b54..057f24c8a3325b1ebc0e8b97f1f9dcca32c900a6 100644 (file)
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -418,8 +418,8 @@ int venc_init_platform_driver(void) __init;
 void venc_uninit_platform_driver(void) __exit;
 
 /* HDMI */
-int hdmi_init_platform_driver(void) __init;
-void hdmi_uninit_platform_driver(void) __exit;
+int hdmi4_init_platform_driver(void) __init;
+void hdmi4_uninit_platform_driver(void) __exit;
 
 /* RFBI */
 int rfbi_init_platform_driver(void) __init;