diff options
| author |   Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-06-05 21:46:54 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-06-05 21:46:54 +0000 |
| commit | 70b6eaee405d657927244067ab2a466425745a0e (patch) | |
| tree | 197df98607ecdc8005105fa1b30986ede019cb0f /drivers/video/omap2/dss/core.c | |
| parent | video: bfin_adv7393fb: Fix cleanup code (diff) | |
| parent | OMAPDSS: fix registration of DPI and SDI devices (diff) | |
| download | linux-dev-70b6eaee405d657927244067ab2a466425745a0e.tar.xz linux-dev-70b6eaee405d657927244067ab2a466425745a0e.zip | |
Merge tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux into fbdev-for-linus
Small fixes for omapdss driver. Most importantly, fixes a build problem when
debugfs or omapdss debug support is turned off, and fixes a suspend related
crash.
Diffstat (limited to 'drivers/video/omap2/dss/core.c')
| -rw-r--r-- | drivers/video/omap2/dss/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 72ded9cd2cb0..5066eee10ccf 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -194,8 +194,7 @@ static inline int dss_initialize_debugfs(void) static inline void dss_uninitialize_debugfs(void) { } -static inline int dss_debugfs_create_file(const char *name, - void (*write)(struct seq_file *)) +int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *)) { return 0; } |