diff options
| author | Tomi Valkeinen <[email protected]> | 2016-06-07 06:00:25 +0000 |
|---|---|---|
| committer | Tomi Valkeinen <[email protected]> | 2016-06-07 09:42:58 +0000 |
| commit | a1dec226a686077a9822013e601327b189f419df (patch) | |
| tree | 296d6fc66689f34308deb91278d3e061f0a53cbc /drivers/gpu/drm/omapdrm/dss/core.c | |
| parent | Merge branch '4.8/omapdrm-pll' (omapdrm PLL work) (diff) | |
| parent | drm/omap: Remove the video/omapdss.h and move it's content to local header file (diff) | |
| download | kernel-a1dec226a686077a9822013e601327b189f419df.tar.gz kernel-a1dec226a686077a9822013e601327b189f419df.zip | |
Merge omapdss header refactoring
Merge omapdss public header refactoring, which separates the public
header into omapdrm and omapfb parts.
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/core.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c index 7e4e5bebabbe..6a3ebfcd7223 100644 --- a/drivers/gpu/drm/omapdrm/dss/core.c +++ b/drivers/gpu/drm/omapdrm/dss/core.c @@ -35,8 +35,7 @@ #include <linux/suspend.h> #include <linux/slab.h> -#include <video/omapdss.h> - +#include "omapdss.h" #include "dss.h" #include "dss_features.h" @@ -196,8 +195,6 @@ static int __init omap_dss_probe(struct platform_device *pdev) core.default_display_name = def_disp_name; else if (pdata->default_display_name) core.default_display_name = pdata->default_display_name; - else if (pdata->default_device) - core.default_display_name = pdata->default_device->name; return 0; |