diff options
author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2014-07-30 11:28:31 +0900 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2014-08-04 13:39:26 +0900 |
commit | 0262ceeb573ae219c920cc9604ef311e285b27f1 (patch) | |
tree | 1bd095952649bfab6b56160fbfa475d59c44d7e3 /drivers/gpu/drm/exynos | |
parent | 9cc7d85e458bbb913cf54b708aa5fab1e5e2db05 (diff) | |
download | op-kernel-dev-0262ceeb573ae219c920cc9604ef311e285b27f1.zip op-kernel-dev-0262ceeb573ae219c920cc9604ef311e285b27f1.tar.gz |
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>
Diffstat (limited to 'drivers/gpu/drm/exynos')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_g2d.c | 1 |
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 28a3168..5d09e33 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[] = { .data = &exynos5_fimd_driver_data }, {}, }; +MODULE_DEVICE_TABLE(of, fimd_driver_dt_match); static inline struct fimd_driver_data *drm_fimd_get_driver_data( 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 5fa1bb6..4e7d1b6 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[] = { { .compatible = "samsung,exynos4212-g2d" }, {}, }; +MODULE_DEVICE_TABLE(of, exynos_g2d_match); struct platform_driver g2d_driver = { .probe = g2d_probe, |