summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2006-01-19 18:14:20 +0000
committerMichael Krufky <devnull@localhost>2006-01-19 18:14:20 +0000
commit522fbf99045e894f09f78b66ba8289a462902afa (patch)
treecca4ebafd01bda4576f2840af5554fa4226bb826
parent14da206d717fafdd321a308201a454c20bf8b7c4 (diff)
downloadmediapointer-dvb-s2-522fbf99045e894f09f78b66ba8289a462902afa.tar.gz
mediapointer-dvb-s2-522fbf99045e894f09f78b66ba8289a462902afa.tar.bz2
group dvb-bt8xx Subsystem ID's together, in order.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
-rw-r--r--linux/drivers/media/video/bttv-cards.c8
-rw-r--r--v4l/ChangeLog7
2 files changed, 11 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index 7a5ba9c30..b46f1118b 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-cards.c,v 1.110 2006/01/12 13:09:55 mchehab Exp $
+ $Id: bttv-cards.c,v 1.111 2006/01/19 18:14:20 mkrufky Exp $
bttv-cards.c
@@ -299,7 +299,6 @@ static struct CARD {
{ 0x03116000, BTTV_BOARD_SENSORAY311, "Sensoray 311" },
{ 0x00790e11, BTTV_BOARD_WINDVR, "Canopus WinDVR PCI" },
{ 0xa0fca1a0, BTTV_BOARD_ZOLTRIX, "Face to Face Tvmax" },
- { 0x20007063, BTTV_BOARD_PC_HDTV, "pcHDTV HD-2000 TV"},
{ 0x82b2aa6a, BTTV_BOARD_SIMUS_GVC1100, "SIMUS GVC1100" },
{ 0x146caa0c, BTTV_BOARD_PV951, "ituner spectra8" },
{ 0x200a1295, BTTV_BOARD_PXC200, "ImageNation PXC200A" },
@@ -321,13 +320,14 @@ static struct CARD {
* { 0x13eb0070, BTTV_BOARD_HAUPPAUGE_IMPACTVCB, "Hauppauge ImpactVCB" }, */
/* DVB cards (using pci function .1 for mpeg data xfer) */
- { 0x01010071, BTTV_BOARD_NEBULA_DIGITV, "Nebula Electronics DigiTV" },
- { 0x07611461, BTTV_BOARD_AVDVBT_761, "AverMedia AverTV DVB-T 761" },
{ 0x001c11bd, BTTV_BOARD_PINNACLESAT, "Pinnacle PCTV Sat" },
+ { 0x01010071, BTTV_BOARD_NEBULA_DIGITV, "Nebula Electronics DigiTV" },
+ { 0x20007063, BTTV_BOARD_PC_HDTV, "pcHDTV HD-2000 TV"},
{ 0x002611bd, BTTV_BOARD_TWINHAN_DST, "Pinnacle PCTV SAT CI" },
{ 0x00011822, BTTV_BOARD_TWINHAN_DST, "Twinhan VisionPlus DVB" },
{ 0xfc00270f, BTTV_BOARD_TWINHAN_DST, "ChainTech digitop DST-1000 DVB-S" },
{ 0x07711461, BTTV_BOARD_AVDVBT_771, "AVermedia AverTV DVB-T 771" },
+ { 0x07611461, BTTV_BOARD_AVDVBT_761, "AverMedia AverTV DVB-T 761" },
{ 0xdb1018ac, BTTV_BOARD_DVICO_DVBT_LITE, "DViCO FusionHDTV DVB-T Lite" },
{ 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE, "DViCO FusionHDTV 5 Lite" },
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index e4e8a0f23..0a8de07b5 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-19 18:13 mkrufky
+
+ * linux/drivers/media/video/bttv-cards.c:
+ - group dvb-bt8xx Subsystem ID's together, in order.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2006-01-19 15:35 mchehab
* linux/drivers/media/video/tvp5150.c: (tvp5150_set_vbi),