DVB/V4L bt8xx tree-merge is currently broken.

If you need this feature, please use an older video4linux cvs:

cvs co -D 9/29/05 video4linux

5 files changed, 56 insertions, 39 deletions

diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index 9a28fc8b2..e8d13b384 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.84 2005/09/29 20:09:24 mchehab Exp $
+    $Id: bttv-cards.c,v 1.85 2005/09/30 00:06:36 mkrufky Exp $
 
     bttv-cards.c
 
@@ -377,7 +377,7 @@ struct tvcard bttv_tvcards[] = {
 		.pll            = PLL_28,
 		.has_radio      = 1,
 	},
-	
+
 	/* ---- card 0x04 ---------------------------------- */
 	[BTTV_BOARD_INTEL] = {
 		.name		= "Intel Create and Share PCI/ Smart Video Recorder III",
@@ -434,7 +434,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= -1,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x08 ---------------------------------- */
 	[BTTV_BOARD_FLYVIDEO] = {
 		.name		= "Lifeview FlyVideo II (Bt848) LR26 / MAXI TV Video PCI2 LR26",
@@ -491,7 +491,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= -1,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x0c ---------------------------------- */
 	[BTTV_BOARD_ADSTECH_TV] = {
 		.name		= "ADS Technologies Channel Surfer TV (bt848)",
@@ -549,7 +549,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= -1,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x10 ---------------------------------- */
 	[BTTV_BOARD_PIXVIEWPLAYTV] = {
 		.name		= "Prolink Pixelview PlayTV (bt878)",
@@ -611,7 +611,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= -1,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x14 ---------------------------------- */
 	[BTTV_BOARD_CEI_RAFFLES] = {
 		.name		= "CEI Raffles Card",
@@ -665,7 +665,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type     = TUNER_ALPS_TSBB5_PAL_I,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x18 ---------------------------------- */
 	[BTTV_BOARD_MAGICTVIEW061] = {
 		.name		= "Askey CPH05X/06X (bt878) [many vendors]",
@@ -722,7 +722,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= TUNER_PHILIPS_SECAM,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x1c ---------------------------------- */
 	[BTTV_BOARD_TERRATV] = {
 		.name           = "Terratec TerraTV+ Version 1.1 (bt878)",
@@ -767,7 +767,7 @@ struct tvcard bttv_tvcards[] = {
 			30000 : Radio
 			40000 : Mute
 	*/
-	
+
 	},
 	[BTTV_BOARD_PXC200] = {
 		/* Jannik Fritsch <jannik@techfak.uni-bielefeld.de> */
@@ -783,7 +783,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= -1,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel_hook    = PXC200_muxsel,
-	
+
 	},
 	[BTTV_BOARD_FLYVIDEO_98] = {
 		.name		= "Lifeview FlyVideo 98 LR50",
@@ -811,7 +811,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x20 ---------------------------------- */
 	[BTTV_BOARD_INTEL_C_S_PCI] = {
 		.name		= "Intel Create and Share PCI/ Smart Video Recorder III",
@@ -887,7 +887,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= -1,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x24 ---------------------------------- */
 	[BTTV_BOARD_TYPHOON_TVIEW] = {
 		.name		= "Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner",
@@ -946,7 +946,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= -1,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x28 ---------------------------------- */
 	[BTTV_BOARD_STB2] = {
 		.name		= "STB TV PCI FM, Gateway P/N 6000704 (bt878), 3Dfx VoodooTV 100",
@@ -1008,7 +1008,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= -1,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x2c ---------------------------------- */
 	[BTTV_BOARD_SIGMA_TVII_FM] = {
 		.name		= "Sigma TVII-FM",
@@ -1068,7 +1068,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_addr	= ADDR_UNSET,
 		.has_radio	= 1,
 	},
-	
+
 	/* ---- card 0x30 ---------------------------------- */
 	[BTTV_BOARD_DYNALINK] = {
 		.name		= "Askey CPH03x/ Dynalink Magic TView",
@@ -1137,7 +1137,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type     = -1 /* TUNER_ALPS_TMDH2_NTSC */,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x34 ---------------------------------- */
 	[BTTV_BOARD_PINNACLEPRO] = {
 		/* David Härdeman <david@2gen.com> */
@@ -1218,7 +1218,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= TUNER_TEMIC_PAL,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x38 ---------------------------------- */
 	[BTTV_BOARD_FLYVIDEO_98FM] = {
 		/* Gordon Heydon <gjheydon@bigfoot.com ('98) */
@@ -1281,7 +1281,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= 0,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x3c ---------------------------------- */
 	[BTTV_BOARD_MM100PCTV] = {
 		/* Philip Blundell <philb@gnu.org> */
@@ -1344,7 +1344,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= TUNER_TEMIC_4006FN5_MULTI_PAL,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x40 ---------------------------------- */
 	[BTTV_BOARD_ATI_TVWONDERVE] = {
 		/* Lukas Gebauer <geby@volny.cz> */
@@ -1413,7 +1413,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_addr	= ADDR_UNSET,
 		.audio_hook     = gvbctv3pci_audio,
 	},
-	
+
 	/* ---- card 0x44 ---------------------------------- */
 	[BTTV_BOARD_VOODOOTV_FM] = {
 		.name           = "3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA)",
@@ -1482,7 +1482,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 	/* ---- card 0x48 ---------------------------------- */
 	[BTTV_BOARD_PV_BT878P_9B] = {
 		/* Dariusz Kowalewski <darekk@automex.pl> */
@@ -1558,7 +1558,7 @@ struct tvcard bttv_tvcards[] = {
 		.pll		= PLL_28,
 		.has_radio	= 1,
 	},
-	
+
 	/* ---- card 0x4c ---------------------------------- */
 	[BTTV_BOARD_WINDVR] = {
 		/* Masaki Suzuki <masaki@btree.org> */
@@ -1632,7 +1632,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type     = -1,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 		/* ---- card 0x50 ---------------------------------- */
 	[BTTV_BOARD_HAUPPAUGEPVR] = {
 		.name           = "Hauppauge WinTV PVR",
@@ -1645,7 +1645,7 @@ struct tvcard bttv_tvcards[] = {
 		.pll            = PLL_28,
 		.tuner_type     = -1,
 		.tuner_addr	= ADDR_UNSET,
-	
+
 		.gpiomask       = 7,
 		.audiomux       = {7},
 	},
@@ -1693,7 +1693,7 @@ struct tvcard bttv_tvcards[] = {
 		.no_tda9875     = 1,
 		.no_tda7432     = 1,
 	},
-	
+
 		/* ---- card 0x54 ---------------------------------- */
 	[BTTV_BOARD_OSPREY101_848] = {
 		.name           = "Osprey 101 (848)", /* 0x05-40C0-C1 */
@@ -1751,7 +1751,7 @@ struct tvcard bttv_tvcards[] = {
 		.no_tda9875     = 1,
 		.no_tda7432     = 1,
 	},
-	
+
 		/* ---- card 0x58 ---------------------------------- */
 	[BTTV_BOARD_OSPREY2x0_SVID] = {
 		.name           = "Osprey 200/250",   /* 0x1(A|B)-00C4-C1 */
@@ -1816,7 +1816,7 @@ struct tvcard bttv_tvcards[] = {
 		.picture_hook   = osprey_540_set_picture,
 	#endif
 	},
-	
+
 		/* ---- card 0x5C ---------------------------------- */
 	[BTTV_BOARD_OSPREY2000] = {
 		.name           = "Osprey 2000",  /* 2000 */
@@ -1886,7 +1886,7 @@ struct tvcard bttv_tvcards[] = {
 		Card lacks: external audio in, pci subsystem id.
 	*/
 	},
-	
+
 		/* ---- card 0x60 ---------------------------------- */
 	[BTTV_BOARD_MACHTV] = {
 		.name           = "MachTV",
@@ -1952,7 +1952,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_addr	= ADDR_UNSET,
 		.audio_hook	= adtvk503_audio,
 	},
-	
+
 		/* ---- card 0x64 ---------------------------------- */
 	[BTTV_BOARD_HERCULES_SM_TV] = {
 		.name           = "Hercules Smart TV Stereo",
@@ -2027,7 +2027,7 @@ struct tvcard bttv_tvcards[] = {
 		.no_tda7432     = 1,
 		.pll            = PLL_28,
 	},
-	
+
 		/* ---- card 0x68 ---------------------------------- */
 	[BTTV_BOARD_NEBULA_DIGITV] = {
 		.name           = "Nebula Electronics DigiTV",
@@ -2089,7 +2089,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_type     = -1,
 		.tuner_addr	= ADDR_UNSET,
 	},
-	
+
 		/* ---- card 0x6c ---------------------------------- */
 	[BTTV_BOARD_VD009_MINIDIN] = {
 		.name           = "PHYTEC VD-009 MiniDIN (bt878)",
@@ -2156,7 +2156,7 @@ struct tvcard bttv_tvcards[] = {
 		.muxsel_hook    = ivc120_muxsel,
 		.pll            = PLL_28,
 	},
-	
+
 		/* ---- card 0x70 ---------------------------------- */
 	[BTTV_BOARD_PC_HDTV] = {
 		.name           = "pcHDTV HD-2000 TV",
@@ -2207,7 +2207,7 @@ struct tvcard bttv_tvcards[] = {
 		.tuner_addr	= ADDR_UNSET,
 		.pll            = PLL_35,
 	},
-	
+
 		/* ---- card 0x74 ---------------------------------- */
 	[BTTV_BOARD_SIMUS_GVC1100] = {
 		.name           = "SIMUS GVC1100",
@@ -2266,7 +2266,7 @@ struct tvcard bttv_tvcards[] = {
 		.audiomux       = { 0x68, 0x68, 0x61, 0x61, 0x00 },
 		.pll            = PLL_28,
 	},
-	
+
 		/* ---- card 0x78 ---------------------------------- */
 	[BTTV_BOARD_CONTVFMI] = {
 		/* Javier Cendan Ares <jcendan@lycos.es> */
@@ -2413,7 +2413,7 @@ struct tvcard bttv_tvcards[] = {
 		.has_remote     = 1,   /* miniremote works, see ir-kbd-gpio.c */
 		.has_radio      = 1,   /* not every card has radio */
 	},
-	
+
 		/* ---- card 0x80 ---------------------------------- */
 	[BTTV_BOARD_DVICO_DVBT_LITE] = {
 		/* Chris Pascoe <c.pascoe@itee.uq.edu.au> */
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index ca483da88..4e0f5b28a 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-input.c,v 1.29 2005/09/28 20:34:07 nsh Exp $
+ * $Id: saa7134-input.c,v 1.30 2005/09/30 00:06:36 mkrufky Exp $
  *
  * handle saa7134 IR remotes via linux kernel input layer.
  *
@@ -585,7 +585,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
 		ir_codes     = videomate_tv_pvr_codes;
 		mask_keycode = 0x003F00;
 		mask_keyup   = 0x040000;
-		break;	
+		break;
 	}
 	if (NULL == ir_codes) {
 		printk("%s: Oops: IR config error [card=%d]\n",
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 81e13df69..270957e70 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,15 @@
+2005-09-30 00:01  mkrufky
+
+	* bttv-cards.c, saa7134-input.c:
+	- strip trailing whitespace.
+
+	* scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+	- V4L: WARNING!  bt8xx tree-merge is currently broken.
+	  If you need this feature, please use an older video4linux cvs:
+	  cvs co -D 9/29/05 video4linux
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-09-29 20:40  mchehab
 
 	* doc/CARDLIST.bttv:
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index aa7a7fb7f..48b08a949 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+echo V4L: WARNING!  bt8xx tree-merge is currently broken.
+echo If you need this feature, please use an older video4linux cvs:
+echo .
+echo cvs co -D 9/29/05 video4linux
+echo .
 echo creating symlinks
 ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.c         dvb-pll.c
 ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.h         dvb-pll.h
@@ -54,7 +59,7 @@ diff -up video4linux.orig/Make.config video4linux/Make.config
  ifeq ($(need_dvb),yes)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
-+ CONFIG_DVB_BT8XX       := m
++ CONFIG_DVB_BT8XX       := n
  endif
  
 diff -up video4linux.orig/Makefile video4linux/Makefile
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 2d8ef70bf..2d9914a87 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -54,7 +54,7 @@ diff -up video4linux/Make.config video4linux.orig/Make.config
  ifeq ($(need_dvb),yes)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
-- CONFIG_DVB_BT8XX       := m
+- CONFIG_DVB_BT8XX       := n
  endif
  
 diff -up video4linux/Makefile video4linux.orig/Makefile