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 /arch | |
| 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 '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; } |