aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2014-07-29 22:28:31 -0400
committerInki Dae <inki.dae@samsung.com>2014-08-04 00:39:26 -0400
commit0262ceeb573ae219c920cc9604ef311e285b27f1 (patch)
tree1bd095952649bfab6b56160fbfa475d59c44d7e3
parent9cc7d85e458bbb913cf54b708aa5fab1e5e2db05 (diff)
Subject: Revert "drm/exynos: fix module build error"
Since 21bdd17b21b45ea48e06e23918d681afbe0622e9 it is possible to have multiple calls to MODULE_DEVICE_TABLE, so the patch can be reverted to restore support for autoloading Conflicts: drivers/gpu/drm/exynos/exynos_drm_fimd.c drivers/gpu/drm/exynos/exynos_drm_g2d.c Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fimd.c1
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_g2d.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 28a3168e24a7..5d09e33fef87 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -174,6 +174,7 @@ static const struct of_device_id fimd_driver_dt_match[] = {
174 .data = &exynos5_fimd_driver_data }, 174 .data = &exynos5_fimd_driver_data },
175 {}, 175 {},
176}; 176};
177MODULE_DEVICE_TABLE(of, fimd_driver_dt_match);
177 178
178static inline struct fimd_driver_data *drm_fimd_get_driver_data( 179static inline struct fimd_driver_data *drm_fimd_get_driver_data(
179 struct platform_device *pdev) 180 struct platform_device *pdev)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 5fa1bb6ba52c..4e7d1b667ce8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -1547,6 +1547,7 @@ static const struct of_device_id exynos_g2d_match[] = {
1547 { .compatible = "samsung,exynos4212-g2d" }, 1547 { .compatible = "samsung,exynos4212-g2d" },
1548 {}, 1548 {},
1549}; 1549};
1550MODULE_DEVICE_TABLE(of, exynos_g2d_match);
1550 1551
1551struct platform_driver g2d_driver = { 1552struct platform_driver g2d_driver = {
1552 .probe = g2d_probe, 1553 .probe = g2d_probe,