Commit a59e1ff3 authored Apr 23, 2013 by Arnd Bergmann Committed by Dave Airlie Apr 26, 2013

drm/tilcdc: use only a single module device table

The tilcdc driver fails to be built as a module because of extraneous
MODULE_DEVICE_TABLE entries:

drivers/gpu/drm/tilcdc/tilcdc_slave.o:(.data+0x54): multiple definition of `__mod_of_device_table'
drivers/gpu/drm/tilcdc/tilcdc_tfp410.o:(.data+0x54): first defined here
drivers/gpu/drm/tilcdc/tilcdc_panel.o:(.data+0x54): multiple definition of `__mod_of_device_table'
drivers/gpu/drm/tilcdc/tilcdc_tfp410.o:(.data+0x54): first defined here
drivers/gpu/drm/tilcdc/tilcdc_drv.o:(.data+0x184): multiple definition of `__mod_of_device_table'
drivers/gpu/drm/tilcdc/tilcdc_tfp410.o:(.data+0x54): first defined here

Since the entire point of these entries is to make the module autoload
when one of the devices is present, it's enough to keep the one entry
for "ti,am33xx-tilcdc", which should always be there if any of the
others are.

Acked-by: Rob Clark <robdclark@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent 84806ade

drivers/gpu/drm/tilcdc/tilcdc_panel.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -413,7 +413,6 @@ static struct of_device_id panel_of_match[] = {
		{ .compatible = "ti,tilcdc,panel", },
		{ },
		};
		MODULE_DEVICE_TABLE(of, panel_of_match);

		struct platform_driver panel_driver = {
		.probe = panel_probe,

drivers/gpu/drm/tilcdc/tilcdc_slave.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,6 @@ static struct of_device_id slave_of_match[] = {
		{ .compatible = "ti,tilcdc,slave", },
		{ },
		};
		MODULE_DEVICE_TABLE(of, slave_of_match);

		struct platform_driver slave_driver = {
		.probe = slave_probe,

drivers/gpu/drm/tilcdc/tilcdc_tfp410.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -396,7 +396,6 @@ static struct of_device_id tfp410_of_match[] = {
		{ .compatible = "ti,tilcdc,tfp410", },
		{ },
		};
		MODULE_DEVICE_TABLE(of, tfp410_of_match);

		struct platform_driver tfp410_driver = {
		.probe = tfp410_probe,