aboutsummaryrefslogtreecommitdiffstats
path: root/include/video/omapdss.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-04-14 22:28:32 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-04-14 22:28:32 +0100
commit4b2f8838479eb2abe042e094f7d2cced6d5ea772 (patch)
tree5ef3236b354a494c8d71a572896283e44989c696 /include/video/omapdss.h
parentMerge branches 'misc', 'vdso' and 'fixes' into for-next (diff)
parentARM: pmu: add support for interrupt-affinity property (diff)
downloadlinux-dev-4b2f8838479eb2abe042e094f7d2cced6d5ea772.tar.xz
linux-dev-4b2f8838479eb2abe042e094f7d2cced6d5ea772.zip
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'include/video/omapdss.h')
-rw-r--r--include/video/omapdss.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 60de61fea8e3..c8ed15daad02 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -689,6 +689,7 @@ struct omapdss_dsi_ops {
};
struct omap_dss_device {
+ struct kobject kobj;
struct device *dev;
struct module *owner;