projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
video
/
omap2
/
dss
/
dss.h
diff --git
a/drivers/video/omap2/dss/dss.h
b/drivers/video/omap2/dss/dss.h
index
2acc661
..
057f24c
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 */
void venc_uninit_platform_driver(void) __exit;
/* HDMI */
-int hdmi_init_platform_driver(void) __init;
-void hdmi_uninit_platform_driver(void) __exit;
+int hdmi
4
_init_platform_driver(void) __init;
+void hdmi
4
_uninit_platform_driver(void) __exit;
/* RFBI */
int rfbi_init_platform_driver(void) __init;
/* RFBI */
int rfbi_init_platform_driver(void) __init;