diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-27 03:32:54 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-06-23 09:55:15 -0400 |
commit | 866f321339988293a5bb3ec6634c2c9d8396bf54 (patch) | |
tree | 0cabecd10708b2cccb1691b7de4c725bad253d9c /drivers | |
parent | 03832aa87f81341d68f5f952c5418984dfb10139 (diff) |
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')
-rw-r--r-- | drivers/staging/media/solo6x10/Kconfig | 1 | ||||
-rw-r--r-- | drivers/video/console/Makefile | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/media/solo6x10/Kconfig b/drivers/staging/media/solo6x10/Kconfig index df6569b997b8..ec32776ff547 100644 --- a/drivers/staging/media/solo6x10/Kconfig +++ b/drivers/staging/media/solo6x10/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | config SOLO6X10 | 1 | config SOLO6X10 |
2 | tristate "Softlogic 6x10 MPEG codec cards" | 2 | tristate "Softlogic 6x10 MPEG codec cards" |
3 | depends on PCI && VIDEO_DEV && SND && I2C | 3 | depends on PCI && VIDEO_DEV && SND && I2C |
4 | depends on FONTS | ||
5 | select VIDEOBUF2_DMA_SG | 4 | select VIDEOBUF2_DMA_SG |
6 | select VIDEOBUF2_DMA_CONTIG | 5 | select VIDEOBUF2_DMA_CONTIG |
7 | select SND_PCM | 6 | select SND_PCM |
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 | |||
18 | 18 | ||
19 | font-objs += $(font-objs-y) | 19 | font-objs += $(font-objs-y) |
20 | 20 | ||
21 | obj-$(CONFIG_FONTS) += font.o | ||
22 | |||
23 | # Each configuration option enables a list of files. | 21 | # Each configuration option enables a list of files. |
24 | 22 | ||
25 | obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o | 23 | obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o |