Merge tag 'iwlwifi-for-kalle-2015-01-05' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / video / fbdev / omap2 / displays-new / encoder-tfp410.c

diff --git a/drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c b/drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c
index 47ee7cdee1c5881a727f97d1863de1f26d6efcc8..92919a74e7156097a5e7ef765e77fdeb2e1674b4 100644 (file)
--- a/drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c
+++ b/drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c
@@ -249,6 +249,7 @@ static int tfp410_probe(struct platform_device *pdev)
        dssdev->output_type = OMAP_DISPLAY_TYPE_DVI;
        dssdev->owner = THIS_MODULE;
        dssdev->phy.dpi.data_lines = ddata->data_lines;
+       dssdev->port_num = 1;
 
        r = omapdss_register_output(dssdev);
        if (r) {
@@ -296,7 +297,6 @@ static struct platform_driver tfp410_driver = {
        .remove = __exit_p(tfp410_remove),
        .driver = {
                .name   = "tfp410",
-               .owner  = THIS_MODULE,
                .of_match_table = tfp410_of_match,
                .suppress_bind_attrs = true,
        },