Commit 4bcd8c90 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Bartlomiej Zolnierkiewicz

omapfb: rename omap2 module to omap2fb.ko

In a kernel configuration with both CONFIG_FB_OMAP=m and CONFIG_FB_OMAP2=m,
Kbuild fails to point out that we have two modules with the same name (omapfb.ko),
but instead fails with a cryptic error message like:

ERROR: "omapfb_register_panel" [drivers/video/fbdev/omap/lcd_osk.ko] undefined!

This can now happen when building a randconfig kernel with CONFIG_ARCH_OMAP1,
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: 7378f114 ("media: omap2: omapfb: allow building it with COMPILE_TEST")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 5958fde7
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
obj-$(CONFIG_OMAP2_VRFB) += vrfb.o obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
obj-y += dss/ obj-y += dss/
obj-y += displays/ obj-y += displays/
obj-$(CONFIG_FB_OMAP2) += omapfb.o obj-$(CONFIG_FB_OMAP2) += omap2fb.o
omapfb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o omap2fb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment