diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-24 21:32:10 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-24 21:32:10 -0700 |
| commit | 8d2977bf36bf6fc66d0c8e64263711cc2f0c1e4b (patch) | |
| tree | ec7ba9c8506ed60509ace9fcd66d38e70d0be562 /arch/arm/mach-omap2/fb.c | |
| parent | b953c0d234bc72e8489d3bf51a276c5c4ec85345 (diff) | |
| parent | e75ea4569d6d1d10935d74ff80bad52dc09bd062 (diff) | |
Merge tag 'armsoc-cleanup' into test-merge
ARM: SoC cleanups for v4.2
A relatively small setup of cleanups this time around, and similar to last time
the bulk of it is removal of legacy board support:
- OMAP: removal of legacy (non-DT) booting for several platforms
- i.MX: remove some legacy board files
Conflicts: None
# gpg: Signature made Wed Jun 24 21:32:09 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
# gpg: aka "Kevin Hilman <khilman@linaro.org>"
# gpg: aka "Kevin Hilman <khilman@kernel.org>"
Diffstat (limited to 'arch/arm/mach-omap2/fb.c')
| -rw-r--r-- | arch/arm/mach-omap2/fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/fb.c b/arch/arm/mach-omap2/fb.c index 26e28e94f625..1f1ecf8807eb 100644 --- a/arch/arm/mach-omap2/fb.c +++ b/arch/arm/mach-omap2/fb.c @@ -84,7 +84,7 @@ int __init omap_init_vrfb(void) pdev = platform_device_register_resndata(NULL, "omapvrfb", -1, res, num_res, NULL, 0); - return PTR_RET(pdev); + return PTR_ERR_OR_ZERO(pdev); } #else int __init omap_init_vrfb(void) { return 0; } |