summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-09 17:35:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-09 17:35:29 -0700
commitecddad64d4ca427c71598cc23183f48bc9cc4568 (patch)
tree935374c13d013683e8a3bdd2136f6b8adfcf1ff1 /include
parentc0e99a71bdb6364b055fadd04eb487a4f590cc1e (diff)
parenta38bb793eaebe1178fbd8ef6ab66ccc062bad505 (diff)
downloadlinux-ecddad64d4ca427c71598cc23183f48bc9cc4568.tar.bz2
Merge tag 'fbdev-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen: - Fix regression in with omapdss when using i2c displays - Fix possible null deref in fbmon - Check kalloc return value in AMBA CLCD * tag 'fbdev-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: OMAPDSS: fix regression with display sysfs files video: fbdev: fix possible null dereference video: ARM CLCD: Add missing error check for devm_kzalloc
Diffstat (limited to 'include')
-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;