Revert "staging/solo6x10: depend on CONFIG_FONTS"

This reverts commit 8c090cfbf980581454ae4caae731574fedd7dce8.

CONFIG_FONTS is not about enabling font support, but about enabling
manual selection of built-in fonts.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/drivers/staging/media/solo6x10/Kconfig b/drivers/staging/media/solo6x10/Kconfig
index df6569b997b88269bfdb48fd17dc410a0da50c0a..ec32776ff5475310c37074c8ed2e5cf5cabd3d06 100644 (file)
--- a/drivers/staging/media/solo6x10/Kconfig
+++ b/drivers/staging/media/solo6x10/Kconfig
@@ -1,7 +1,6 @@
 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

diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile
index 48da25c96cd3c2a160077e880f58fed3a52da0f8..a862e9173ebed67d67cac954a98eb70a9f94c346 100644 (file)
--- a/drivers/video/console/Makefile
+++ b/drivers/video/console/Makefile
@@ -18,8 +18,6 @@ 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