From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-eopbgr690126.outbound.protection.outlook.com ([40.107.69.126]:51988 "EHLO NAM04-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729261AbeIGFPP (ORCPT ); Fri, 7 Sep 2018 01:15:15 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Arnd Bergmann , Mauro Carvalho Chehab , Bartlomiej Zolnierkiewicz , Sasha Levin Subject: [PATCH AUTOSEL 4.18 49/88] omapfb: rename omap2 module to omap2fb.ko Date: Fri, 7 Sep 2018 00:36:28 +0000 Message-ID: <20180907003547.57567-49-alexander.levin@microsoft.com> References: <20180907003547.57567-1-alexander.levin@microsoft.com> In-Reply-To: <20180907003547.57567-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Arnd Bergmann [ Upstream commit 4bcd8c90ac0f27d3d76fcfc50582ff3685059de9 ] In a kernel configuration with both CONFIG_FB_OMAP=3Dm and CONFIG_FB_OMAP2= =3Dm, Kbuild fails to point out that we have two modules with the same name (omap= fb.ko), but instead fails with a cryptic error message like: ERROR: "omapfb_register_panel" [drivers/video/fbdev/omap/lcd_osk.ko] undefi= ned! This can now happen when building a randconfig kernel with CONFIG_ARCH_OMAP= 1, as the omap1 fbdev driver depends on that, whiel the omap2 fbdev driver can now be built anywhere with CONFIG_COMPILE_TEST. The solution is to rename one of the two modules, so for consistency with the directory naming I decided to rename the omap2 version to omap2fb.ko. Fixes: 7378f1149884 ("media: omap2: omapfb: allow building it with COMPILE_= TEST") Signed-off-by: Arnd Bergmann Acked-by: Tony Lindgren Cc: Mauro Carvalho Chehab Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/omap2/omapfb/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/omap2/omapfb/Makefile b/drivers/video/fbde= v/omap2/omapfb/Makefile index 602edfed09df..f54c3f56b641 100644 --- a/drivers/video/fbdev/omap2/omapfb/Makefile +++ b/drivers/video/fbdev/omap2/omapfb/Makefile @@ -2,5 +2,5 @@ obj-$(CONFIG_OMAP2_VRFB) +=3D vrfb.o obj-y +=3D dss/ obj-y +=3D displays/ -obj-$(CONFIG_FB_OMAP2) +=3D omapfb.o -omapfb-y :=3D omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o +obj-$(CONFIG_FB_OMAP2) +=3D omap2fb.o +omap2fb-y :=3D omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o --=20 2.17.1