| Message ID | 20190606094712.23715-1-anders.roxell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fix warnings for same module names | expand |
On Thu, Jun 06, 2019 at 11:47:12AM +0200, Anders Roxell wrote: > 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 <anders.roxell@linaro.org> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> I'm assuming Bart will pick this one up for fbdev. -Daniel > --- > 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 > > -- > 2.20.1 >
On 6/7/19 9:57 AM, Daniel Vetter wrote: > On Thu, Jun 06, 2019 at 11:47:12AM +0200, Anders Roxell wrote: >> 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 <anders.roxell@linaro.org> > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > I'm assuming Bart will pick this one up for fbdev. The DRM mxsfb has been a default for almost a year (since July 2018) and I've just applied "[PATCH] video: fbdev: mxsfb: Remove driver" (https://marc.info/?l=dri-devel&m=155835758115686&w=2) so it seems that this patch is not needed any longer (sorry!). > -Daniel > >> --- >> 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 >> >> -- >> 2.20.1 Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
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
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 <anders.roxell@linaro.org> --- drivers/gpu/drm/mxsfb/Makefile | 4 ++-- drivers/video/fbdev/Makefile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)