Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c090cfb authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging/solo6x10: depend on CONFIG_FONTS 



The new SOLO6X10 driver needs the built-in console fonts, specifically
the VGA8x16 font and building it without console support results in
a link error error.

drivers/built-in.o: In function `solo_osd_print':
 :(.text+0x7d3424): undefined reference to `find_font'

This adds a dependency on the CONFIG_FONTS symbol and changes the
console code to always build the base driver even if there are
no specific fonts built-in.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fcce7680

drivers/staging/media/solo6x10/Kconfig

+1 −0
Original line number Diff line number Diff line 
config SOLO6X10

	tristate "Softlogic 6x10 MPEG codec cards"

	depends on PCI && VIDEO_DEV && SND && I2C

	depends on FONTS

	select VIDEOBUF2_DMA_SG

	select VIDEOBUF2_DMA_CONTIG

	select SND_PCM

drivers/video/console/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ font-objs-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o 


font-objs += $(font-objs-y)



obj-$(CONFIG_FONTS) += font.o



# Each configuration option enables a list of files.



obj-$(CONFIG_DUMMY_CONSOLE)       += dummycon.o