summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog11
-rw-r--r--v4l/Make.config1
-rw-r--r--v4l/Makefile3
3 files changed, 15 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index f6568060d..73b7fbd81 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-28 12:55 mkrufky
+
+ * ../v4l/Make.config:
+ * ../v4l/Makefile:
+ - Enable support for OSD functions in dvb-ttpci driver.
+
+ Thanks to both Matthias Schwarzott <zzam@gentoo.org> and
+ Frank Enderle <fen@init-6.org>, for each sending in the same fix.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-11-27 17:34 mkrufky
* ../v4l/Makefile:
diff --git a/v4l/Make.config b/v4l/Make.config
index ab9d0841e..2a6edf57c 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -87,6 +87,7 @@ ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
CONFIG_DVB_BUDGET_CI := m
CONFIG_DVB_BUDGET_PATCH := m
CONFIG_DVB_AV7110 := m
+ CONFIG_DVB_AV7110_OSD := y
CONFIG_DVB_TTUSB_BUDGET := m
CONFIG_DVB_TTUSB_DEC := m
CONFIG_VIDEO_SAA7146 := m
diff --git a/v4l/Makefile b/v4l/Makefile
index 291511440..7fc236897 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -160,6 +160,9 @@ endif
ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1
endif
+ifeq ($(CONFIG_DVB_AV7110_OSD),y)
+ EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_OSD=1
+endif
#################################################
# compile modules