summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-10-27 04:33:27 +0000
committerMichael Krufky <devnull@localhost>2005-10-27 04:33:27 +0000
commitbe5a5383388034d7757116daa71d59ae4b002ff1 (patch)
tree92c73b2f77b2c65532ba4215d52e850ea39f34e2 /v4l
parent8986d215104a954362dbae6a7595da6bdbd467f3 (diff)
downloadmediapointer-dvb-s2-be5a5383388034d7757116daa71d59ae4b002ff1.tar.gz
mediapointer-dvb-s2-be5a5383388034d7757116daa71d59ae4b002ff1.tar.bz2
* ../linux/drivers/media/video/cx88/Kconfig:
* ../linux/drivers/media/video/cx88/Makefile: * ../linux/drivers/media/video/cx88/cx88-dvb.c: (nxt200x_set_ts_param), (dvb_register): * ../v4l/Makefile: - Added support for NXT200X based cards (ATI HDTV Wonder) * ../linux/drivers/media/video/cx88/cx88-cards.c: (cx88_card_setup): - Cleaned up initialization of ATI HDTV Wonder. The card is now able to work in analog or digital mode and able to switch between them without any problems. * ../linux/drivers/media/video/tuner-simple.c: (default_set_tv_freq): - Fixed value in "Philips TUV1236D ATSC/NTSC dual in" tuner data. - When tuning the "Philips TUV1236D ATSC/NTSC dual in" tuner, make sure that we are in the correct tuning mode. Signed-off-by: Kirk Lapray <kirk.lapray@gmail.com> Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog24
-rw-r--r--v4l/Makefile5
2 files changed, 27 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index a06eca41a..7b6cc8a2e 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,27 @@
+2005-10-27 04:27 mkrufky
+
+ * ../linux/drivers/media/video/cx88/Kconfig:
+ * ../linux/drivers/media/video/cx88/Makefile:
+ * ../linux/drivers/media/video/cx88/cx88-dvb.c:
+ (nxt200x_set_ts_param), (dvb_register):
+ * ../v4l/Makefile:
+ - Added support for NXT200X based cards (ATI HDTV Wonder)
+
+ * ../linux/drivers/media/video/cx88/cx88-cards.c:
+ (cx88_card_setup):
+ - Cleaned up initialization of ATI HDTV Wonder. The card is now
+ able to work in analog or digital mode and able to switch
+ between them without any problems.
+
+ * ../linux/drivers/media/video/tuner-simple.c:
+ (default_set_tv_freq):
+ - Fixed value in "Philips TUV1236D ATSC/NTSC dual in" tuner data.
+ - When tuning the "Philips TUV1236D ATSC/NTSC dual in" tuner,
+ make sure that we are in the correct tuning mode.
+
+ Signed-off-by: Kirk Lapray <kirk.lapray@gmail.com>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-10-26 21:26 mchehab
* ../linux/drivers/media/video/bttv-i2c.c: (attach_inform):
diff --git a/v4l/Makefile b/v4l/Makefile
index 73944eed5..6d9b30b06 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -55,7 +55,7 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
obj-$(CONFIG_DVB_FRONTENDS) += cx22702.o dvb-pll.o or51132.o lgdt330x.o \
mt352.o tda1004x.o sp887x.o nxt6000.o \
- cx24110.o or51211.o
+ cx24110.o or51211.o nxt200x.o
# 2.6-only stuff
ifeq ($(VERSION).$(PATCHLEVEL),2.6)
@@ -77,6 +77,7 @@ ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
EXTRA_CFLAGS += -DHAVE_OR51132=1
EXTRA_CFLAGS += -DHAVE_LGDT330X=1
EXTRA_CFLAGS += -DHAVE_MT352=1
+ EXTRA_CFLAGS += -DHAVE_NXT200X=1
endif
ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m)
EXTRA_CFLAGS += -DHAVE_MT352=1
@@ -160,7 +161,7 @@ inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko
inst_usb := em2820.ko
inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko
inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko
-inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko
+inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko nxt200x.ko
v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))