54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
|
From patchwork Fri Apr 26 05:03:10 2013
|
||
|
|
Content-Type: text/plain; charset="utf-8"
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Transfer-Encoding: 7bit
|
||
|
|
Subject: drm/exynos: fix multiple definition build error
|
||
|
|
Date: Fri, 26 Apr 2013 05:03:10 -0000
|
||
|
|
From: Inki Dae <inki.dae@samsung.com>
|
||
|
|
X-Patchwork-Id: 2490831
|
||
|
|
Message-Id: <1366952590-11652-1-git-send-email-inki.dae@samsung.com>
|
||
|
|
To: airlied@linux.ie, dri-devel@lists.freedesktop.org
|
||
|
|
Cc: kyungmin.park@samsung.com, sw0312.kim@samsung.com
|
||
|
|
|
||
|
|
This patch fixes multiple definition error like below when building it
|
||
|
|
as moudle with device tree support.
|
||
|
|
|
||
|
|
drivers/gpu/drm/exynos/exynos_drm_g2d.o: In function `.LANCHOR1':
|
||
|
|
exynos_drm_g2d.c:(.rodata+0x6c): multiple definition of `__mod_of_device_table'
|
||
|
|
drivers/gpu/drm/exynos/exynos_drm_fimd.o:exynos_drm_fimd.c:(.rodata+0x144): first defined here
|
||
|
|
|
||
|
|
Signed-off-by: Inki Dae <inki.dae@samsung.com>
|
||
|
|
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +-
|
||
|
|
drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
|
||
|
|
index 746b282..1e02d13 100644
|
||
|
|
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
|
||
|
|
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
|
||
|
|
@@ -117,7 +117,7 @@ static const struct of_device_id fimd_driver_dt_match[] = {
|
||
|
|
.data = &exynos5_fimd_driver_data },
|
||
|
|
{},
|
||
|
|
};
|
||
|
|
-MODULE_DEVICE_TABLE(of, fimd_driver_dt_match);
|
||
|
|
+MODULE_DEVICE_TABLE(of_fimd, fimd_driver_dt_match);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
static inline struct fimd_driver_data *drm_fimd_get_driver_data(
|
||
|
|
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
|
||
|
|
index 47a493c..6a01ff1 100644
|
||
|
|
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
|
||
|
|
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
|
||
|
|
@@ -1525,7 +1525,7 @@ static const struct of_device_id exynos_g2d_match[] = {
|
||
|
|
{ .compatible = "samsung,exynos5250-g2d" },
|
||
|
|
{},
|
||
|
|
};
|
||
|
|
-MODULE_DEVICE_TABLE(of, exynos_g2d_match);
|
||
|
|
+MODULE_DEVICE_TABLE(of_g2d, exynos_g2d_match);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
struct platform_driver g2d_driver = {
|