From patchwork Fri Jul 18 20:36:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sjoerd Simons X-Patchwork-Id: 4587621 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C00E19F39B for ; Fri, 18 Jul 2014 20:37:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A23A200E5 for ; Fri, 18 Jul 2014 20:37:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02ACA20125 for ; Fri, 18 Jul 2014 20:37:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762259AbaGRUh0 (ORCPT ); Fri, 18 Jul 2014 16:37:26 -0400 Received: from cube.luon.net ([37.72.100.20]:36885 "EHLO cube.luon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762141AbaGRUhU (ORCPT ); Fri, 18 Jul 2014 16:37:20 -0400 Received: from localhost (localhost [127.0.0.1]) by cube.luon.net (Postfix) with ESMTP id E7B75E28F9; Fri, 18 Jul 2014 22:37:18 +0200 (CEST) Received: from cube.luon.net ([127.0.0.1]) by localhost (cube.luon.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aP4S5ouXxKOa; Fri, 18 Jul 2014 22:37:18 +0200 (CEST) Received: from dusk.luon.net (g111211.upc-g.chello.nl [80.57.111.211]) by cube.luon.net (Postfix) with ESMTPSA id BCC4AE28BC; Fri, 18 Jul 2014 22:37:18 +0200 (CEST) Received: by dusk.luon.net (Postfix, from userid 1000) id 729EF227BB; Fri, 18 Jul 2014 22:37:18 +0200 (CEST) From: Sjoerd Simons To: Inki Dae Cc: Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Kukjin Kim , linux-samsung-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, Sjoerd Simons Subject: [PATCH 1/3] Revert "drm/exynos: fix module build error" Date: Fri, 18 Jul 2014 22:36:39 +0200 Message-Id: <1405715801-5325-2-git-send-email-sjoerd.simons@collabora.co.uk> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1405715801-5325-1-git-send-email-sjoerd.simons@collabora.co.uk> References: <1405715801-5325-1-git-send-email-sjoerd.simons@collabora.co.uk> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit de1d3677017a1d58419722b60564cb56bd9462c3, which was original added to fix build errors when building exynosdrm as a single module caused by multiple MODULE_DEVICE_TABLE in one module. Which, as a side-effect broke autoloading of the module. 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 --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 33161ad..081eb15 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -136,6 +136,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 8001587..bb728c8 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c @@ -1546,6 +1546,7 @@ static const struct of_device_id exynos_g2d_match[] = { { .compatible = "samsung,exynos5250-g2d" }, {}, }; +MODULE_DEVICE_TABLE(of, exynos_g2d_match); struct platform_driver g2d_driver = { .probe = g2d_probe,