diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 10:26:38 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 10:26:38 (GMT) |
| commit | df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1 (patch) | |
| tree | a091be1024bd76627f78e791e377126e47703b7b /drivers/video/fbdev/omap2/dss/sdi.c | |
| parent | ed8f8ce38d0f7b505d7da2d79522972e962457c2 (diff) | |
| parent | 4e1c0664de11e4b5861957ab4ddff2aeeffd042f (diff) | |
| download | linux-df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1.tar.xz | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/sdi.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/sdi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/sdi.c b/drivers/video/fbdev/omap2/dss/sdi.c index d51a9830..5c2ccab 100644 --- a/drivers/video/fbdev/omap2/dss/sdi.c +++ b/drivers/video/fbdev/omap2/dss/sdi.c @@ -342,6 +342,8 @@ static void sdi_init_output(struct platform_device *pdev) out->output_type = OMAP_DISPLAY_TYPE_SDI; out->name = "sdi.0"; out->dispc_channel = OMAP_DSS_CHANNEL_LCD; + /* We have SDI only on OMAP3, where it's on port 1 */ + out->port_num = 1; out->ops.sdi = &sdi_ops; out->owner = THIS_MODULE; |