summaryrefslogtreecommitdiffstats
path: root/drivers/video/console
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-05-27 09:32:54 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-06-23 15:55:15 +0200
commit866f321339988293a5bb3ec6634c2c9d8396bf54 (patch)
tree0cabecd10708b2cccb1691b7de4c725bad253d9c /drivers/video/console
parentinput: cros_ec_keyb_clear_keyboard() depends on CONFIG_PM_SLEEP (diff)
downloadlinux-866f321339988293a5bb3ec6634c2c9d8396bf54.tar.xz
linux-866f321339988293a5bb3ec6634c2c9d8396bf54.zip
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>
Diffstat (limited to 'drivers/video/console')
-rw-r--r--drivers/video/console/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile
index 48da25c96cd3..a862e9173ebe 100644
--- 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