summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-01-28 19:37:39 +0000
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-01-28 19:37:39 +0000
commit64a9de8f07bf9ca909561c50d9f9e63bb7221b91 (patch)
tree69ca086d847d80eb927556cfe74c5467c6dce038 /include
parentf7f5ef0afdcca69fb02ded1763c28eca74e6b54d (diff)
parentc49d005b6cc8491fad5b24f82805be2d6bcbd3dd (diff)
Merge branch 'for-3.3-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-for-linus
Diffstat (limited to 'include')
-rw-r--r--include/video/omapdss.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 062b3b24ff10..483f67caa7ad 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;