Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a942535d authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes

parents d0124f01 4ee9d9d2

drivers/video/fbdev/omap2/displays-new/connector-analog-tv.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -301,6 +301,8 @@ static const struct of_device_id tvc_of_match[] = { 
	{},

	{},

};

};





MODULE_DEVICE_TABLE(of, tvc_of_match);



static struct platform_driver tvc_connector_driver = {

static struct platform_driver tvc_connector_driver = {

	.probe	= tvc_probe,

	.probe	= tvc_probe,

	.remove	= __exit_p(tvc_remove),

	.remove	= __exit_p(tvc_remove),
@@ -308,6 +310,7 @@ static struct platform_driver tvc_connector_driver = { 
		.name	= "connector-analog-tv",

		.name	= "connector-analog-tv",

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

		.of_match_table = tvc_of_match,

		.of_match_table = tvc_of_match,

		.suppress_bind_attrs = true,

	},

	},

};

};

drivers/video/fbdev/omap2/displays-new/connector-dvi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -391,6 +391,7 @@ static struct platform_driver dvi_connector_driver = { 
		.name	= "connector-dvi",

		.name	= "connector-dvi",

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

		.of_match_table = dvic_of_match,

		.of_match_table = dvic_of_match,

		.suppress_bind_attrs = true,

	},

	},

};

};

drivers/video/fbdev/omap2/displays-new/connector-hdmi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -437,6 +437,7 @@ static struct platform_driver hdmi_connector_driver = { 
		.name	= "connector-hdmi",

		.name	= "connector-hdmi",

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

		.of_match_table = hdmic_of_match,

		.of_match_table = hdmic_of_match,

		.suppress_bind_attrs = true,

	},

	},

};

};

drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -298,6 +298,7 @@ static struct platform_driver tfp410_driver = { 
		.name	= "tfp410",

		.name	= "tfp410",

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

		.of_match_table = tfp410_of_match,

		.of_match_table = tfp410_of_match,

		.suppress_bind_attrs = true,

	},

	},

};

};

drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -461,6 +461,7 @@ static struct platform_driver tpd_driver = { 
		.name	= "tpd12s015",

		.name	= "tpd12s015",

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

		.of_match_table = tpd_of_match,

		.of_match_table = tpd_of_match,

		.suppress_bind_attrs = true,

	},

	},

};

};