[kernel] r16333 - in dists/trunk/linux-2.6/debian/patches: bugfix/all series
Ben Hutchings
benh at alioth.debian.org
Sun Sep 19 01:53:31 UTC 2010
Author: benh
Date: Sun Sep 19 01:53:29 2010
New Revision: 16333
Log:
Fix config dependencies for VIDEO_VIVI
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/all/vivi-Don-t-depend-on-FONTS.patch
Modified:
dists/trunk/linux-2.6/debian/patches/series/base
Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/vivi-Don-t-depend-on-FONTS.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/vivi-Don-t-depend-on-FONTS.patch Sun Sep 19 01:53:29 2010 (r16333)
@@ -0,0 +1,27 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 19 Sep 2010 02:48:38 +0100
+Subject: [PATCH] vivi: Don't depend on FONTS
+
+CONFIG_FONTS has nothing to do with whether find_font() is defined.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/media/video/Kconfig | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
+index f6e4d04..7528d50 100644
+--- a/drivers/media/video/Kconfig
++++ b/drivers/media/video/Kconfig
+@@ -539,7 +539,7 @@ config VIDEO_VIU
+ config VIDEO_VIVI
+ tristate "Virtual Video Driver"
+ depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
+- depends on (FRAMEBUFFER_CONSOLE || STI_CONSOLE) && FONTS
++ depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
+ select FONT_8x16
+ select VIDEOBUF_VMALLOC
+ default n
+--
+1.7.1
+
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Sun Sep 19 01:34:25 2010 (r16332)
+++ dists/trunk/linux-2.6/debian/patches/series/base Sun Sep 19 01:53:29 2010 (r16333)
@@ -43,3 +43,5 @@
+ features/all/staging-Add-initial-release-of-brcm80211.patch
+ bugfix/all/brcm80211-Fix-some-initialisation-failure-paths.patch
+
++ bugfix/all/vivi-Don-t-depend-on-FONTS.patch
More information about the Kernel-svn-changes
mailing list