From patchwork Thu Jun 6 09:47:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 10980961 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C7D8114B6 for ; Fri, 7 Jun 2019 07:45:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B950F21E5A for ; Fri, 7 Jun 2019 07:45:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD79228901; Fri, 7 Jun 2019 07:45:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6826321E5A for ; Fri, 7 Jun 2019 07:45:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7313A89AC3; Fri, 7 Jun 2019 07:44:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0ED7C89690 for ; Thu, 6 Jun 2019 09:47:19 +0000 (UTC) Received: by mail-lj1-x241.google.com with SMTP id 131so1377162ljf.4 for ; Thu, 06 Jun 2019 02:47:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dQfbJoiQ5WTWGjUJ1PADkmMlX7UTg1NHq4Oh3Ljtrbo=; b=LArkyXbOmrijpuqGS+VyrP+Z47rZe8ee9up0dSnMiRkw6M+HyqC/jlDZDWDMVd0oJy aPrJw3TwrwMG0VLkCOXhLfMg3cMeZXxuuwzxX3GZqcecvfAdVYBMn+y+N62V3Wdf+mru LV4Kxipdjf7DhgxK0EBYGGAu5cxhEXePjXPDMmeJXvf2GEsf8hnCg6htrW4xsEdCPnYH bU4Yt1eLKioSVbFxVNjXYd/nwu641GkjM/ihZS6QEFTq+/rsBk60P9JrP9Dr5bY8a1dr 3YMUcEEsKzXOKGQ9Y0+5g/TtnswdPy9VKsxBxxjRtrkghqrQZ5sBWrtp7AqCxiwo/Bm9 5QkA== X-Gm-Message-State: APjAAAVKXjCciZw7YQg4JDMTkkJ9j7cb9Zmf4AqBeyrISu52B0PWPY5l NF0VDaYPcwKiVlmqAARIiaykFg== X-Google-Smtp-Source: APXvYqynVELsYqcqQ3WkOuXVc21SB/kMXSnXwhm4rJjbGqpBW3X6B+fXTZsFIXnZIxLxYIvULF3Ugg== X-Received: by 2002:a2e:9cc3:: with SMTP id g3mr9015135ljj.117.1559814437482; Thu, 06 Jun 2019 02:47:17 -0700 (PDT) Received: from localhost (c-1c3670d5.07-21-73746f28.bbcust.telenor.se. [213.112.54.28]) by smtp.gmail.com with ESMTPSA id s20sm214365lfb.95.2019.06.06.02.47.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 06 Jun 2019 02:47:16 -0700 (PDT) From: Anders Roxell To: marex@denx.de, stefan@agner.ch, airlied@linux.ie, daniel@ffwll.ch, shawnguo@kernel.org, s.hauer@pengutronix.de, b.zolnierkie@samsung.com Subject: [PATCH 3/8] drivers: (video|gpu): fix warning same module names Date: Thu, 6 Jun 2019 11:47:12 +0200 Message-Id: <20190606094712.23715-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 07 Jun 2019 07:43:40 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dQfbJoiQ5WTWGjUJ1PADkmMlX7UTg1NHq4Oh3Ljtrbo=; b=v0l1t7motrGGJZjUZw7mZhdXu71rcqkX14qgcfNJsj0pBDkflH+Yc72Rh58UO+K/ma NkcmwaO4ZRwUGSEf8FDCBIG9d5FZ14s3/Wu+e7uRpuc3N+NwdVmPkgZ3ASVth/T3MdYP zkyIoXbtLNxGxDWBwLZLLWP5BgK4Cj1MAjGGDwMPETEClXrqSkfGB+ui3a6x4JzT1JRI G7GVtXsWqf6Jrl0j4cKaP5Z91IJPDBMDrMDcVB3HTk4V95x6QgEjoib0TMkiQWzWtb0X Fwk6a3D+h0Vdr8Ji3cBC+l5ZJv9LqytaxcbMrFHRJKAG/dbb4ZLq/iU1m+2Kc78Nhxrd PHug== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrew@lunn.ch, linux-fbdev@vger.kernel.org, f.fainelli@gmail.com, Anders Roxell , linux-media@vger.kernel.org, netdev@vger.kernel.org, lgirdwood@gmail.com, dri-devel@lists.freedesktop.org, davem@davemloft.net, broonie@kernel.org, linux-arm-kernel@lists.infradead.org, mchehab@kernel.org, lee.jones@linaro.org, vivien.didelot@gmail.com, linux-kernel@vger.kernel.org, hkallweit1@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP When building with CONFIG_DRM_MXSFB and CONFIG_FB_MXS enabled as loadable modules, we see the following warning: warning: same module names found: drivers/video/fbdev/mxsfb.ko drivers/gpu/drm/mxsfb/mxsfb.ko Rework so the names matches the config fragment. Signed-off-by: Anders Roxell Reviewed-by: Daniel Vetter --- drivers/gpu/drm/mxsfb/Makefile | 4 ++-- drivers/video/fbdev/Makefile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/Makefile b/drivers/gpu/drm/mxsfb/Makefile index ff6e358088fa..5d49d7548e66 100644 --- a/drivers/gpu/drm/mxsfb/Makefile +++ b/drivers/gpu/drm/mxsfb/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -mxsfb-y := mxsfb_drv.o mxsfb_crtc.o mxsfb_out.o -obj-$(CONFIG_DRM_MXSFB) += mxsfb.o +drm-mxsfb-y := mxsfb_drv.o mxsfb_crtc.o mxsfb_out.o +obj-$(CONFIG_DRM_MXSFB) += drm-mxsfb.o diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index 655f2537cac1..7ee967525af2 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -131,7 +131,8 @@ obj-$(CONFIG_FB_VGA16) += vga16fb.o obj-$(CONFIG_FB_OF) += offb.o obj-$(CONFIG_FB_MX3) += mx3fb.o obj-$(CONFIG_FB_DA8XX) += da8xx-fb.o -obj-$(CONFIG_FB_MXS) += mxsfb.o +obj-$(CONFIG_FB_MXS) += fb-mxs.o +fb-mxs-objs := mxsfb.o obj-$(CONFIG_FB_SSD1307) += ssd1307fb.o obj-$(CONFIG_FB_SIMPLE) += simplefb.o