path: root/include
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-07 15:54:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-07 15:54:02 -0800
commit98e96852480566333f6dacd3223f0be15df34d60 (patch)
treedab2122717f7e371d9e20c0bc3561c501d61c658 /include
parent8eef05dd3e70233f3e391774d612dab44c3f023b (diff)
parent9f1065032ceb7e86c7c9f16bb86518857e88a172 (diff)
Merge tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6
fbdev fixes for 3.3 It includes: - compile fix for fsl-diu-fb - fix for a suspend/resume issue in atmel_lcdfb - fix for a suspend/resume issue in OMAP - workaround for a hardware bug to avoid physical damage in OMAP - really trivial dead code removal in intelfb * tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6: atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume intelfb: remove some dead code drivers/video: compile fixes for fsl-diu-fb.c OMAPDSS: HDMI: PHY burnout fix OMAP: 4430SDP/Panda: add HDMI HPD gpio OMAP: 4430SDP/Panda: setup HDMI GPIO muxes OMAPDSS: remove wrong HDMI HPD muxing OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpios OMAPDSS: use sync versions of pm_runtime_put
Diffstat (limited to 'include')
1 files changed, 5 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 062b3b24ff1..483f67caa7a 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -590,6 +590,11 @@ struct omap_dss_device {
int (*get_backlight)(struct omap_dss_device *dssdev);
+struct omap_dss_hdmi_data
+ int hpd_gpio;
struct omap_dss_driver {
struct device_driver driver;