From patchwork Mon Feb 22 21:08:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8383461 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EAA31C0553 for ; Mon, 22 Feb 2016 21:11:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34EB0205D1 for ; Mon, 22 Feb 2016 21:11:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5040B205CD for ; Mon, 22 Feb 2016 21:11:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EE496E2C4; Mon, 22 Feb 2016 21:11:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id B84E26E2C4 for ; Mon, 22 Feb 2016 21:11:03 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0LZwFx-1a6Hu821mP-00lmAj; Mon, 22 Feb 2016 22:10:57 +0100 From: Arnd Bergmann To: Rob Clark Subject: [PATCH 2/8] drm: msm: rename module Date: Mon, 22 Feb 2016 22:08:36 +0100 Message-Id: <1456175331-714117-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456175331-714117-1-git-send-email-arnd@arndb.de> References: <1456175331-714117-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:G8Re6WFJJQmMZLKl6THIJroaIZ/zOz82P8ip9OMJHkYZGE9QDOf k8QkVmvVU0PS66eEjlRrPxck5C9rDbGe2btaOGf8a762HhZVwbfWvZ8xQE00EgAzDv2x41K 6+BayLZq2jwz1I+unobbuwauF/1l63/8SMv+WVC15JlKvFng/izI9xtym/gCiE5P8SGt2TI SDnBoMFVzmQciPRz6sAXA== X-UI-Out-Filterresults: notjunk:1; V01:K0:fRRwkZooWck=:SyjDAKYviZ0haq7S3Ph97j 4UEt8+qzmpta4lxhD5nUTguO5pdfpk+LJYNrcVtjyXLgeUKt6RmMHEefaWQ92GeuFTR6gFPig HOwKZBZcSIruJ9keueDYg89sFOpmRCzPaUPZnkMkvrbZTX6imfl29GTQEOjUv5cUkGl/usZX9 o71QnB96CFuVX9LNA4OHXFRZ1UILSpzHMx3NbjTPrGnG1Z9YBIWAHTEyL2MCm3t2Z06CUztsi dUyjbQzmZ+zF3/BCAcVRq1jYRCn+mWWMloLgMf1uZTmcDoBbFhwV6kj/oNgVC3WqSH7c7ooqN E1TR3FMU9y3t9/nxs3xfiI9TsRIrVdlwyZO0gthQXl3IuJJW2LGdZGtuRHpRgT7AJ2Te35l8s NL2rTGPc4p8PImvxh4CbDjxaelfy7M6qbE6AzQG8RqPdX3jxAl1C0HqUpC9btnCbd+syWN726 BMqgHzaE20HWpk5YXSkvbof9g4TO8bepIfYj6Gdo/MV3W6pYaU+fzUzTR2Ljq1MThNxiPS6an voJlnONbV1NDWa8D67S5zWcs/+ZwJcNz9oRfgQvPba1l6XjEVYw6mm25E/nUPxIdF4zLDO7zs Fqu+sVH9GUBXd4TPzmb5yDm6vpWAEc1EOtbnG9tMuaddwIolBJ+/RbNatmRvv2CyUmVNkKAe0 azKKg8CG4T0Yp0J7zUYBxPAoYg281Ex8SuLz0g0OlG3vC4gh7EL70SnnbcntlZctoW8U= Cc: dri-devel@lists.freedesktop.org, Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 msm.ko is not an appropriate name for a module that drives a specific device on the msm platform. This changes the name to drm_msm.ko to have something that won't conflict with any other module name. Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 9386cfeb55b2..24f6fd2b9651 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -1,6 +1,6 @@ ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm -msm-y := \ +drm-msm-y := \ adreno/adreno_device.o \ adreno/adreno_gpu.o \ adreno/a3xx_gpu.o \ @@ -34,14 +34,14 @@ msm-y := \ msm_rd.o \ msm_ringbuffer.o -msm-$(CONFIG_DRM_MSM_DSI) += mdp/mdp4/mdp4_dsi_encoder.o \ - mdp/mdp5/mdp5_cmd_encoder.o +drm-msm-$(CONFIG_DRM_MSM_DSI) += mdp/mdp4/mdp4_dsi_encoder.o \ + mdp/mdp5/mdp5_cmd_encoder.o -msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o -msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o +drm-msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o +drm-msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o obj-$(CONFIG_DRM_MSM_DSI) += dsi/ obj-$(CONFIG_DRM_MSM_HDMI) += hdmi/ obj-$(CONFIG_DRM_MSM_EDP) += edp/ -obj-$(CONFIG_DRM_MSM) += msm.o +obj-$(CONFIG_DRM_MSM) += drm-msm.o