diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-13 18:57:30 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-13 18:57:30 +0400 |
| commit | 7794f709c5897e8876801ff205cc758c0e7bc901 (patch) | |
| tree | f67ecaa5746bbba5a30d7be259de15b64c9a5baf /arch | |
| parent | 94fa83c424321189ca24fb6cb4c0d224cdedc72d (diff) | |
| parent | c3a21fc79b6bc097d8b0e47498903a649a111127 (diff) | |
| download | linux-7794f709c5897e8876801ff205cc758c0e7bc901.tar.xz | |
Merge tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux
Pull omapdss build problem fix from Tomi Valkeinen:
"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."
This has apparently been annoying rmk for a while..
* tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux:
OMAPDSS: fix registration of DPI and SDI devices
OMAPDSS: DSI: Fix bug when calculating LP command interleaving parameters
OMAPDSS: fix bogus WARN_ON in dss_runtime_put()
OMAPDSS: Taal: fix compilation warning
OMAPDSS: fix build when DEBUG_FS or DSS_DEBUG_SUPPORT disabled
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 54d49ddb9b81..5fb47a14f4ba 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -271,9 +271,9 @@ static struct platform_device *create_simple_dss_pdev(const char *pdev_name, goto err; } - r = omap_device_register(pdev); + r = platform_device_add(pdev); if (r) { - pr_err("Could not register omap_device for %s\n", pdev_name); + pr_err("Could not register platform_device for %s\n", pdev_name); goto err; } |