summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2006-01-21 16:07:45 +0000
committerMichael Krufky <devnull@localhost>2006-01-21 16:07:45 +0000
commit138cc43d32b8bb65c72c6239252cad82ec7d18dd (patch)
tree8c60bb7ed22e345bdf65f93145203158777602ff /v4l
parentc2adc8ccca8b66d34544b8cf3d67eda633ab586f (diff)
downloadmediapointer-dvb-s2-138cc43d32b8bb65c72c6239252cad82ec7d18dd.tar.gz
mediapointer-dvb-s2-138cc43d32b8bb65c72c6239252cad82ec7d18dd.tar.bz2
Kill nxt2002 in favor of the nxt200x module
From: Michael Krufky <mkrufky@m1k.net> - Kill nxt2002 module in favor of nxt200x. - Repair broken nxt2002 support in the nxt200x module. - Make the flexcop driver use nxt200x instead of the nxt2002 module for the Air2PC 2nd generation PCI card. - Remove the nxt2002 module from cvs and kernel build. Signed-off-by: Michael Krufky <mkrufky@m1k.net> CC: Kirk Lapray <kirk.lapray@gmail.com> CC: Taylor Jacob <rtjacob@earthlink.net> CC: Jean-Francois Thibert <jeanfrancois@sagetv.com>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog21
-rw-r--r--v4l/Makefile4
2 files changed, 23 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 059dd0d1f..7ccf462d7 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,24 @@
+2006-01-21 15:59 mkrufky
+
+ * linux/drivers/media/dvb/b2c2/Kconfig:
+ * linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c:
+ (flexcop_frontend_init):
+ * linux/drivers/media/dvb/frontends/Kconfig:
+ * linux/drivers/media/dvb/frontends/Makefile:
+ * linux/drivers/media/dvb/frontends/dvb-pll.c:
+ * linux/drivers/media/dvb/frontends/nxt2002.c:
+ * linux/drivers/media/dvb/frontends/nxt2002.h:
+ * linux/drivers/media/dvb/frontends/nxt200x.c:
+ (nxt200x_setup_frontend_parameters):
+ * v4l/Makefile:
+ - Kill nxt2002 module in favor of nxt200x
+ - Repair broken nxt2002 support in the nxt200x module.
+ - Make the flexcop driver use nxt200x instead of the
+ nxt2002 module for the Air2PC 2nd generation PCI card.
+ - Remove the nxt2002 module from cvs and kernel build.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2006-01-21 04:42 mcisely
* v4l_experimental/pvrusb2/pvrusb2-v4l2.c: (pvr2_v4l2_read):
diff --git a/v4l/Makefile b/v4l/Makefile
index b073227f1..3c8a517a0 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -106,7 +106,7 @@ obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
obj-$(CONFIG_DVB_FRONTENDS) += dvb-pll.o cx22702.o or51132.o lgdt330x.o \
mt352.o tda1004x.o sp887x.o nxt6000.o \
cx24110.o or51211.o nxt200x.o cx24123.o \
- mt312.o stv0299.o nxt2002.o bcm3510.o \
+ mt312.o stv0299.o bcm3510.o \
dib3000-common.o dib3000mb.o dib3000mc.o \
ves1820.o cx22700.o tda8083.o ves1x93.o \
stv0297.o sp8870.o l64781.o s5h1420.o \
@@ -289,7 +289,7 @@ inst_em28xx := em28xx.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 += nxt200x.ko cx24123.ko mt312.ko stv0299.ko nxt2002.ko
+inst_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko
inst_frontends += bcm3510.ko dib3000mb.ko dib3000mc.ko ves1820.ko
inst_frontends += cx22700.ko tda8083.ko ves1x93.ko stv0297.ko sp8870.ko
inst_frontends += l64781.ko s5h1420.ko tda10021.ko at76c651.ko tda80xx.ko