From 4374bd74e68c4791b3d40c8bf671c236e9fda708 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 19 Sep 2010 01:53:29 +0000 Subject: [PATCH] Fix config dependencies for VIDEO_VIVI svn path=/dists/trunk/linux-2.6/; revision=16333 --- .../all/vivi-Don-t-depend-on-FONTS.patch | 27 +++++++++++++++++++ debian/patches/series/base | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 debian/patches/bugfix/all/vivi-Don-t-depend-on-FONTS.patch diff --git a/debian/patches/bugfix/all/vivi-Don-t-depend-on-FONTS.patch b/debian/patches/bugfix/all/vivi-Don-t-depend-on-FONTS.patch new file mode 100644 index 000000000..af3da5837 --- /dev/null +++ b/debian/patches/bugfix/all/vivi-Don-t-depend-on-FONTS.patch @@ -0,0 +1,27 @@ +From: Ben Hutchings +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 +--- + 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 + diff --git a/debian/patches/series/base b/debian/patches/series/base index b511a2608..b2b191a90 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -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