diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-06-07 09:00:25 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-06-07 12:42:58 +0300 |
| commit | a1dec226a686077a9822013e601327b189f419df (patch) | |
| tree | 296d6fc66689f34308deb91278d3e061f0a53cbc /drivers/video/fbdev/omap2/omapfb/dss/core.c | |
| parent | ecf140dfc3fe169aaff8f5561d345f6b96d7b476 (diff) | |
| parent | 26038aad2511566c1a0923777e76565a13af0b8d (diff) | |
| download | linux-a1dec226a686077a9822013e601327b189f419df.tar.gz linux-a1dec226a686077a9822013e601327b189f419df.tar.bz2 linux-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/video/fbdev/omap2/omapfb/dss/core.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/core.c b/drivers/video/fbdev/omap2/omapfb/dss/core.c index 5a87179b7312..29de4827589d 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/core.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c @@ -35,7 +35,7 @@ #include <linux/suspend.h> #include <linux/slab.h> -#include <video/omapdss.h> +#include <video/omapfb_dss.h> #include "dss.h" #include "dss_features.h" @@ -208,8 +208,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; register_pm_notifier(&omap_dss_pm_notif_block); |