From f06cb9bbdaeac34821821b6c258e9f80aad6ddc8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 5 Jun 2012 13:17:32 +0300 Subject: [PATCH] --- yaml --- r: 310677 b: refs/heads/master c: c3a21fc79b6bc097d8b0e47498903a649a111127 h: refs/heads/master i: 310675: d3a83883c4474a328a0fa18235e66371a3cbc708 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/display.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ca22ef459616..b568b981b0f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e063c305a3da896ec3db99e66891411d0e38820 +refs/heads/master: c3a21fc79b6bc097d8b0e47498903a649a111127 diff --git a/trunk/arch/arm/mach-omap2/display.c b/trunk/arch/arm/mach-omap2/display.c index 54d49ddb9b81..5fb47a14f4ba 100644 --- a/trunk/arch/arm/mach-omap2/display.c +++ b/trunk/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; }