From 786e7a5240900ab37ff23f8eacf69866425e2ef8 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 2 May 2013 17:16:23 +0200
Subject: [PATCH] --- yaml --- r: 376042 b: refs/heads/master c:
 8c090cfbf980581454ae4caae731574fedd7dce8 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/media/solo6x10/Kconfig | 1 +
 trunk/drivers/video/console/Makefile         | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1dab17ae209f..e7eb501e706f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcce768067ae5f397ab5f96e2e471b9ba6a4bf96
+refs/heads/master: 8c090cfbf980581454ae4caae731574fedd7dce8
diff --git a/trunk/drivers/staging/media/solo6x10/Kconfig b/trunk/drivers/staging/media/solo6x10/Kconfig
index ec32776ff547..df6569b997b8 100644
--- a/trunk/drivers/staging/media/solo6x10/Kconfig
+++ b/trunk/drivers/staging/media/solo6x10/Kconfig
@@ -1,6 +1,7 @@
 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/trunk/drivers/video/console/Makefile b/trunk/drivers/video/console/Makefile
index a862e9173ebe..48da25c96cd3 100644
--- a/trunk/drivers/video/console/Makefile
+++ b/trunk/drivers/video/console/Makefile
@@ -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