merge: http://www.linuxtv.org/hg/~manu/v4l-algo

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

44 files changed, 555 insertions, 274 deletions

diff --git a/Makefile b/Makefile
index 1f11bcb3f..9d6f7c3e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 BUILD_DIR := $(shell pwd)/v4l
+TMP ?= /tmp
 REPO_PULL := http://linuxtv.org/hg/v4l-dvb
 ifeq ($(REPO_PUSH),)
   ifneq ($(CHANGE_LOG_LOGIN),)
@@ -26,9 +27,10 @@ install:
 
 commit cvscommit hgcommit change changes changelog:: whitespace
 	cd $(BUILD_DIR); scripts/cardlist; cd ..
-	v4l/scripts/prep_commit_msg.pl >/tmp/v4l_hg_commit.msg
-	$(EDITOR) /tmp/v4l_hg_commit.msg
-	grep -v ^# /tmp/v4l_hg_commit.msg | hg commit -l -
+	v4l/scripts/prep_commit_msg.pl $(TMP)/v4l_hg_whitespace > \
+		$(TMP)/v4l_hg_commit.msg
+	$(EDITOR) $(TMP)/v4l_hg_commit.msg
+	grep -v '^#' $(TMP)/v4l_hg_commit.msg | hg commit -l -
 	@echo "*** PLEASE CHECK IF LOG IS OK:"
 	@hg log -v -r -1
 	@echo "*** If not ok, do hg undo and make commit again"
@@ -43,5 +45,5 @@ push::
 
 whitespace:
 	@echo "Cleaning bad whitespaces"
-	@v4l/scripts/strip-trailing-whitespaces.sh | patch -p0
-
+	@v4l/scripts/strip-trailing-whitespaces.sh fast | \
+		tee $(TMP)/v4l_hg_whitespace | patch -p0
diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88
index 19a0a6a46..6cb63ddf6 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx88
+++ b/linux/Documentation/video4linux/CARDLIST.cx88
@@ -15,7 +15,7 @@
  14 -> KWorld/VStream XPert DVB-T                          [17de:08a6]
  15 -> DViCO FusionHDTV DVB-T1                             [18ac:db00]
  16 -> KWorld LTV883RF
- 17 -> DViCO FusionHDTV 3 Gold-Q                           [18ac:d810]
+ 17 -> DViCO FusionHDTV 3 Gold-Q                           [18ac:d810,18ac:d800]
  18 -> Hauppauge Nova-T DVB-T                              [0070:9002,0070:9001]
  19 -> Conexant DVB-T reference design                     [14f1:0187]
  20 -> Provideo PV259                                      [1540:2580]
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134
index bca509032..9068b669f 100644
--- a/linux/Documentation/video4linux/CARDLIST.saa7134
+++ b/linux/Documentation/video4linux/CARDLIST.saa7134
@@ -93,3 +93,4 @@
  92 -> AVerMedia A169 B1                        [1461:6360]
  93 -> Medion 7134 Bridge #2                    [16be:0005]
  94 -> LifeView FlyDVB-T Hybrid Cardbus         [5168:3306,5168:3502]
+ 95 -> LifeView FlyVIDEO3000 (NTSC)             [5169:0138]
diff --git a/linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt b/linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt
index 59193b6b5..9df4fb3ea 100644
--- a/linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt
+++ b/linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt
@@ -280,7 +280,7 @@ Description
 Param[0]
 	Bitmask:
 	     0:1  Data size:
-	    	      '00' 16 bit
+		      '00' 16 bit
 		      '01' 20 bit
 		      '10' 24 bit
 	     2:7  Unused
@@ -292,9 +292,9 @@ Param[0]
 			   (for left justified MSB first mode, 20 bit only)
 	    10:11 Unused
 	    12:13 Channel format:
-	    	      '00' right justified MSB first mode
-	    	      '01' left justified MSB first mode
-	    	      '10' I2S mode
+		      '00' right justified MSB first mode
+		      '01' left justified MSB first mode
+		      '10' I2S mode
 	    14:15 Unused
 	    16:21 Right justify bit count
 	    22:31 Unused
diff --git a/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt
index 64cd11134..08ee9f530 100644
--- a/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt
+++ b/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt
@@ -281,64 +281,64 @@ Description
 Param[0]
 	Bitmask:
 	   0:1  '00' 44.1Khz
-	    	'01' 48Khz
-	    	'10' 32Khz
-	    	'11' reserved
+		'01' 48Khz
+		'10' 32Khz
+		'11' reserved
 
 	   2:3  '01'=Layer I
 		'10'=Layer II
 
 	   4:7  Bitrate:
-	    	     Index | Layer I     | Layer II
-	    	     ------+-------------+------------
-	    	    '0000' | free format | free format
-	    	    '0001' |  32 kbit/s  |  32 kbit/s
-	    	    '0010' |  64 kbit/s  |  48 kbit/s
-	    	    '0011' |  96 kbit/s  |  56 kbit/s
-	    	    '0100' | 128 kbit/s  |  64 kbit/s
-	    	    '0101' | 160 kbit/s  |  80 kbit/s
-	    	    '0110' | 192 kbit/s  |  96 kbit/s
-	    	    '0111' | 224 kbit/s  | 112 kbit/s
-	    	    '1000' | 256 kbit/s  | 128 kbit/s
-	    	    '1001' | 288 kbit/s  | 160 kbit/s
-	    	    '1010' | 320 kbit/s  | 192 kbit/s
-	    	    '1011' | 352 kbit/s  | 224 kbit/s
-	    	    '1100' | 384 kbit/s  | 256 kbit/s
-	    	    '1101' | 416 kbit/s  | 320 kbit/s
-	    	    '1110' | 448 kbit/s  | 384 kbit/s
-	    	Note: For Layer II, not all combinations of total bitrate
-	    	and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2
+		     Index | Layer I     | Layer II
+		     ------+-------------+------------
+		    '0000' | free format | free format
+		    '0001' |  32 kbit/s  |  32 kbit/s
+		    '0010' |  64 kbit/s  |  48 kbit/s
+		    '0011' |  96 kbit/s  |  56 kbit/s
+		    '0100' | 128 kbit/s  |  64 kbit/s
+		    '0101' | 160 kbit/s  |  80 kbit/s
+		    '0110' | 192 kbit/s  |  96 kbit/s
+		    '0111' | 224 kbit/s  | 112 kbit/s
+		    '1000' | 256 kbit/s  | 128 kbit/s
+		    '1001' | 288 kbit/s  | 160 kbit/s
+		    '1010' | 320 kbit/s  | 192 kbit/s
+		    '1011' | 352 kbit/s  | 224 kbit/s
+		    '1100' | 384 kbit/s  | 256 kbit/s
+		    '1101' | 416 kbit/s  | 320 kbit/s
+		    '1110' | 448 kbit/s  | 384 kbit/s
+		Note: For Layer II, not all combinations of total bitrate
+		and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2
 
 	   8:9  '00'=Stereo
-	    	'01'=JointStereo
-	    	'10'=Dual
-	    	'11'=Mono
+		'01'=JointStereo
+		'10'=Dual
+		'11'=Mono
 
 	  10:11 Mode Extension used in joint_stereo mode.
-	    	In Layer I and II they indicate which subbands are in
+		In Layer I and II they indicate which subbands are in
 		intensity_stereo. All other subbands are coded in stereo.
-	    	    '00' subbands 4-31 in intensity_stereo, bound==4
-	    	    '01' subbands 8-31 in intensity_stereo, bound==8
-	    	    '10' subbands 12-31 in intensity_stereo, bound==12
-	    	    '11' subbands 16-31 in intensity_stereo, bound==16
+		    '00' subbands 4-31 in intensity_stereo, bound==4
+		    '01' subbands 8-31 in intensity_stereo, bound==8
+		    '10' subbands 12-31 in intensity_stereo, bound==12
+		    '11' subbands 16-31 in intensity_stereo, bound==16
 
 	  12:13 Emphasis:
-	    	    '00' None
-	    	    '01' 50/15uS
-	    	    '10' reserved
-	    	    '11' CCITT J.17
+		    '00' None
+		    '01' 50/15uS
+		    '10' reserved
+		    '11' CCITT J.17
 
 	  14 	CRC:
-	    	    '0' off
-	    	    '1' on
+		    '0' off
+		    '1' on
 
 	  15    Copyright:
-	    	    '0' off
-	    	    '1' on
+		    '0' off
+		    '1' on
 
 	  16    Generation:
-	    	    '0' copy
-	    	    '1' original
+		    '0' copy
+		    '1' original
 
 -------------------------------------------------------------------------------
 
diff --git a/linux/Documentation/video4linux/cx2341x/fw-memory.txt b/linux/Documentation/video4linux/cx2341x/fw-memory.txt
index 336d8208e..ef0aad3f8 100644
--- a/linux/Documentation/video4linux/cx2341x/fw-memory.txt
+++ b/linux/Documentation/video4linux/cx2341x/fw-memory.txt
@@ -60,7 +60,7 @@ DMA Registers 0x000-0xff:
 	if changed to 0xffffffff DMA write interrupts break.
  0x50 - always 0xffffffff
  0x54 - always 0xffffffff (0x4c, 0x50, 0x54 seem like interrupt masks, are
-    	3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the
+	3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the
 	interrupt masks???).
  0x60-0x7C - random values
  0x80 - first write linked list reg, for Encoder Memory addr
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
index 83ec5e06c..fcff5eab2 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -473,7 +473,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)
 			goto bailout;
 		}
 		memcpy(&demux->tsbuf[i], buf, j);
-		if ((demux->tsbuf[0] == 0x47) | (demux->tsbuf[0] == 0xB8)) {
+		if ((demux->tsbuf[0] == 0x47) || (demux->tsbuf[0] == 0xB8)) {
 			memcpy(tmppack, demux->tsbuf, 188);
 			if (tmppack[0] == 0xB8)
 				tmppack[0] = 0x47;
@@ -484,7 +484,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)
 	}
 
 	while (p < count) {
-		if ((buf[p] == 0x47) | (buf[p] == 0xB8)) {
+		if ((buf[p] == 0x47) || (buf[p] == 0xB8)) {
 			if (count - p >= 204) {
 				memcpy(tmppack, &buf[p], 188);
 				if (tmppack[0] == 0xB8)
diff --git a/linux/drivers/media/dvb/frontends/lgdt330x.c b/linux/drivers/media/dvb/frontends/lgdt330x.c
index 2a28b768c..b48b82b11 100644
--- a/linux/drivers/media/dvb/frontends/lgdt330x.c
+++ b/linux/drivers/media/dvb/frontends/lgdt330x.c
@@ -685,6 +685,7 @@ static int lgdt3303_read_snr(struct dvb_frontend* fe, u16* snr)
 
 	if (state->current_modulation == VSB_8) {
 
+		i2c_read_demod_bytes(state, 0x6e, buf, 5);
 #if 0
 		/* Equalizer Mean-Square Error Register for VSB */
 		noise = ((buf[0] & 0x78) << 13) | (buf[1] << 8) | buf[2];
diff --git a/linux/drivers/media/radio/radio-typhoon.c b/linux/drivers/media/radio/radio-typhoon.c
index 519899793..4f5adce15 100644
--- a/linux/drivers/media/radio/radio-typhoon.c
+++ b/linux/drivers/media/radio/radio-typhoon.c
@@ -368,7 +368,7 @@ static int __init typhoon_init(void)
 #ifdef CONFIG_RADIO_TYPHOON_PROC_FS
 	if (!create_proc_info_entry("driver/radio-typhoon", 0, NULL,
 				    typhoon_get_info))
-	    	printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n");
+		printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n");
 #endif
 
 	return 0;
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index 134af1cad..2ed46e87e 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/drivers/media/video/Kconfig
@@ -312,17 +312,6 @@ config VIDEO_HEXIUM_GEMINI
 
 source "drivers/media/video/cx88/Kconfig"
 
-config VIDEO_OVCAMCHIP
-	tristate "OmniVision Camera Chip support"
-	depends on I2C && VIDEO_V4L1
-	---help---
-	  Support for the OmniVision OV6xxx and OV7xxx series of camera chips.
-	  This driver is intended to be used with the ov511 and w9968cf USB
-	  camera drivers.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called ovcamchip.
-
 config VIDEO_M32R_AR
 	tristate "AR devices"
 	depends on M32R && VIDEO_V4L1
@@ -395,10 +384,10 @@ config VIDEO_WM8739
 source "drivers/media/video/cx25840/Kconfig"
 
 config VIDEO_SAA711X
-	tristate "Philips SAA7113/4/5 video decoders (OBSOLETED)"
-	depends on VIDEO_V4L1 && I2C && EXPERIMENTAL
+	tristate "Philips SAA7113/4/5 video decoders"
+	depends on VIDEO_DEV && I2C && EXPERIMENTAL
 	---help---
-	  Old support for the Philips SAA7113/4 video decoders.
+	  Support for the Philips SAA7113/4/5 video decoders.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called saa7115.
@@ -464,6 +453,35 @@ source "drivers/media/video/usbvideo/Kconfig"
 
 source "drivers/media/video/et61x251/Kconfig"
 
+config VIDEO_OVCAMCHIP
+	tristate "OmniVision Camera Chip support"
+	depends on I2C && VIDEO_V4L1
+	---help---
+	  Support for the OmniVision OV6xxx and OV7xxx series of camera chips.
+	  This driver is intended to be used with the ov511 and w9968cf USB
+	  camera drivers.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called ovcamchip.
+
+config USB_W9968CF
+	tristate "USB W996[87]CF JPEG Dual Mode Camera support"
+	depends on USB && VIDEO_V4L1 && I2C
+	select VIDEO_OVCAMCHIP
+	---help---
+	  Say Y here if you want support for cameras based on OV681 or
+	  Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
+
+	  This driver has an optional plugin, which is distributed as a
+	  separate module only (released under GPL). It allows to use higher
+	  resolutions and framerates, but cannot be included in the official
+	  Linux kernel for performance purposes.
+
+	  See <file:Documentation/video4linux/w9968cf.txt> for more info.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called w9968cf.
+
 config USB_OV511
 	tristate "USB OV511 Camera support"
 	depends on USB && VIDEO_V4L1
@@ -500,24 +518,6 @@ config USB_STV680
 	  To compile this driver as a module, choose M here: the
 	  module will be called stv680.
 
-config USB_W9968CF
-	tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-	depends on USB && VIDEO_V4L1 && I2C
-	select VIDEO_OVCAMCHIP
-	---help---
-	  Say Y here if you want support for cameras based on OV681 or
-	  Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
-
-	  This driver has an optional plugin, which is distributed as a
-	  separate module only (released under GPL). It allows to use higher
-	  resolutions and framerates, but cannot be included in the official
-	  Linux kernel for performance purposes.
-
-	  See <file:Documentation/video4linux/w9968cf.txt> for more info.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called w9968cf.
-
 source "drivers/media/video/zc0301/Kconfig"
 
 source "drivers/media/video/pwc/Kconfig"
diff --git a/linux/drivers/media/video/arv.c b/linux/drivers/media/video/arv.c
index 6c82b2fef..24c0ddc33 100644
--- a/linux/drivers/media/video/arv.c
+++ b/linux/drivers/media/video/arv.c
@@ -214,7 +214,7 @@ void init_iic(void)
 	ar_outl(0x0300, PLDI2CMOD); 	/* I2CMOD ACK/8b-data/7b-addr/auto */
 	ar_outl(0x1, PLDI2CACK);	/* I2CACK ACK                      */
 
-    	/* I2C CLK */
+	/* I2C CLK */
 	/* 50MH-100k */
 	if (freq == 75) {
 		ar_outl(369, PLDI2CFREQ);	/* BCLK = 75MHz */
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c
index 0d690cc7f..584d91f1c 100644
--- a/linux/drivers/media/video/bt8xx/bttv-cards.c
+++ b/linux/drivers/media/video/bt8xx/bttv-cards.c
@@ -292,7 +292,7 @@ static struct CARD {
 	{ 0x41a0a051, BTTV_BOARD_FLYVIDEO_98FM, "Lifeview FlyVideo 98 LR50 Rev Q" },
 	{ 0x18501f7f, BTTV_BOARD_FLYVIDEO_98,   "Lifeview Flyvideo 98" },
 
-    	{ 0x010115cb, BTTV_BOARD_GMV1,          "AG GMV1" },
+	{ 0x010115cb, BTTV_BOARD_GMV1,          "AG GMV1" },
 	{ 0x010114c7, BTTV_BOARD_MODTEC_205,    "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV" },
 
 	{ 0x10b42636, BTTV_BOARD_HAUPPAUGE878,  "STB ???" },
diff --git a/linux/drivers/media/video/bt8xx/bttv-input.c b/linux/drivers/media/video/bt8xx/bttv-input.c
index bab7cb123..ce5ce470a 100644
--- a/linux/drivers/media/video/bt8xx/bttv-input.c
+++ b/linux/drivers/media/video/bt8xx/bttv-input.c
@@ -356,7 +356,7 @@ int bttv_input_init(struct bttv *btv)
 
 	if (ir->rc5_gpio) {
 		u32 gpio;
-	    	/* enable remote irq */
+		/* enable remote irq */
 		bttv_gpio_inout(&btv->c, (1 << 4), 1 << 4);
 		gpio = bttv_gpio_read(&btv->c);
 		bttv_gpio_write(&btv->c, gpio & ~(1 << 4));
diff --git a/linux/drivers/media/video/bw-qcam.c b/linux/drivers/media/video/bw-qcam.c
index 108612e1f..497fc3418 100644
--- a/linux/drivers/media/video/bw-qcam.c
+++ b/linux/drivers/media/video/bw-qcam.c
@@ -763,7 +763,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
 		{
 			struct video_picture *p = arg;
 			if(p->palette!=VIDEO_PALETTE_GREY)
-			    	return -EINVAL;
+				return -EINVAL;
 			if(p->depth!=4 && p->depth!=6)
 				return -EINVAL;
 
diff --git a/linux/drivers/media/video/cpia2/cpia2_v4l.c b/linux/drivers/media/video/cpia2/cpia2_v4l.c
index 481e178ef..d129db57f 100644
--- a/linux/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/linux/drivers/media/video/cpia2/cpia2_v4l.c
@@ -343,7 +343,9 @@ static int cpia2_close(struct inode *inode, struct file *file)
 		cpia2_free_buffers(cam);
 		if (!cam->present) {
 			video_unregister_device(dev);
+			mutex_unlock(&cam->busy_lock);
 			kfree(cam);
+			return 0;
 		}
 	}
 
@@ -1167,9 +1169,9 @@ static int ioctl_g_ctrl(void *arg,struct camera_data *cam)
 		} else {
 		    if(cam->params.flicker_control.cam_register &
 		       CPIA2_VP_FLICKER_MODES_50HZ) {
-		    	mode = FLICKER_50;
+			mode = FLICKER_50;
 		    } else {
-		    	mode = FLICKER_60;
+			mode = FLICKER_60;
 		    }
 		}
 		for(i=0; i<NUM_FLICKER_CONTROLS; i++) {
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c
index 69d3c3c8f..7085192bc 100644
--- a/linux/drivers/media/video/cx88/cx88-alsa.c
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c
@@ -799,7 +799,6 @@ static int __devinit snd_cx88_create(struct snd_card *card,
 	chip->irq = -1;
 	spin_lock_init(&chip->reg_lock);
 
-	cx88_reset(core);
 	chip->core = core;
 
 	/* get irq */
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 5431d591e..9de27a929 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1468,6 +1468,10 @@ struct cx88_subid cx88_subids[] = {
 		.subvendor = 0x107d,
 		.subdevice = 0x665e,
 		.card      = CX88_BOARD_WINFAST_DTV2000H,
+	},{
+		.subvendor = 0x18ac,
+		.subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */
+		.card      = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q,
 	},
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index d4674cac2..fb17c1e66 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -359,7 +359,7 @@ static struct or51132_config pchdtv_hd3000 = {
 
 #ifdef HAVE_LGDT330X
 static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
-			    	     struct dvb_frontend_parameters* params)
+				     struct dvb_frontend_parameters* params)
 {
 	/* FIXME make this routine use the tuner-simple code.
 	 * It could probably be shared with a number of ATSC
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c
index 9283be42d..0a98940f3 100644
--- a/linux/drivers/media/video/cx88/cx88-input.c
+++ b/linux/drivers/media/video/cx88/cx88-input.c
@@ -90,7 +90,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
 		auxgpio = cx_read(MO_GP1_IO);
 		/* Take out the parity part */
-		gpio+=(auxgpio & 0xef);
+		gpio+=(gpio & 0x7fd) + (auxgpio & 0xef);
 	} else
 		auxgpio = gpio;
 
diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c
index efd8d231c..9a42e9a6b 100644
--- a/linux/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c
@@ -52,6 +52,7 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/delay.h>
+#include <linux/config.h>
 #include "compat.h"
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux/kthread.h>
@@ -140,12 +141,12 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
 {
 	u32 volume;
 
-#ifndef USING_CX88_ALSA
+#ifndef CONFIG_VIDEO_CX88_ALSA
 	/* restart dma; This avoids buzz in NICAM and is good in others  */
 	cx88_stop_audio_dma(core);
 #endif
 	cx_write(AUD_RATE_THRES_DMD, 0x000000C0);
-#ifndef USING_CX88_ALSA
+#ifndef CONFIG_VIDEO_CX88_ALSA
 	cx88_start_audio_dma(core);
 #endif
 
@@ -156,6 +157,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
 		case CX88_BOARD_KWORLD_MCE200_DELUXE:
 		case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
 		case CX88_BOARD_PIXELVIEW_PLAYTV_P7000:
+		case CX88_BOARD_ASUS_PVR_416:
 			cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
 			break;
 		default:
diff --git a/linux/drivers/media/video/ov511.c b/linux/drivers/media/video/ov511.c
index 564a88293..5d2899c80 100644
--- a/linux/drivers/media/video/ov511.c
+++ b/linux/drivers/media/video/ov511.c
@@ -3239,7 +3239,7 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
 		RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw);
 
 		if (frame->scanstate == STATE_LINES) {
-	    		int nextf;
+			int nextf;
 
 			frame->grabstate = FRAME_DONE;
 			wake_up_interruptible(&frame->wq);
@@ -3405,7 +3405,7 @@ eof:
 	RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw);
 
 	if (frame->scanstate == STATE_LINES) {
-    		int nextf;
+		int nextf;
 
 		frame->grabstate = FRAME_DONE;
 		wake_up_interruptible(&frame->wq);
diff --git a/linux/drivers/media/video/pms.c b/linux/drivers/media/video/pms.c
index d129072a9..e13a7f8b8 100644
--- a/linux/drivers/media/video/pms.c
+++ b/linux/drivers/media/video/pms.c
@@ -812,7 +812,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
 			struct video_picture *p = arg;
 			if(!((p->palette==VIDEO_PALETTE_RGB565 && p->depth==16)
 			    ||(p->palette==VIDEO_PALETTE_RGB555 && p->depth==15)))
-			    	return -EINVAL;
+				return -EINVAL;
 			pd->picture= *p;
 
 			/*
diff --git a/linux/drivers/media/video/pwc/pwc-ctrl.c b/linux/drivers/media/video/pwc/pwc-ctrl.c
index c64f498f1..acd8d4af1 100644
--- a/linux/drivers/media/video/pwc/pwc-ctrl.c
+++ b/linux/drivers/media/video/pwc/pwc-ctrl.c
@@ -925,7 +925,7 @@ int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value)
 	return SendControlMsg(SET_STATUS_CTL, LED_FORMATTER, 2);
 }
 
-int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)
+static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)
 {
 	unsigned char buf[2];
 	int ret;
@@ -1404,7 +1404,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
 
 		ARG_IN(leds)
 		ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off);
-	    	break;
+		break;
 	}
 
 
diff --git a/linux/drivers/media/video/pwc/pwc-dec23.c b/linux/drivers/media/video/pwc/pwc-dec23.c
index 39eaf5839..9e2d91f26 100644
--- a/linux/drivers/media/video/pwc/pwc-dec23.c
+++ b/linux/drivers/media/video/pwc/pwc-dec23.c
@@ -105,7 +105,7 @@ static void build_bit_powermask_table(struct pwc_dec23_private *pdec)
 
 
 static void build_table_color(const unsigned int romtable[16][8],
-    			      unsigned char p0004[16][1024],
+			      unsigned char p0004[16][1024],
 			      unsigned char p8004[16][256])
 {
 	int compression_mode, j, k, bit, pw;
@@ -787,7 +787,7 @@ static void DecompressBand23(struct pwc_dec23_private *pdec,
  *
  */
 static void DecompressBandBayer(struct pwc_dec23_private *pdec,
-    				const unsigned char *rawyuv,
+				const unsigned char *rawyuv,
 				unsigned char *rgbbayer,
 				unsigned int   compressed_image_width,
 				unsigned int   real_image_width)
diff --git a/linux/drivers/media/video/pwc/pwc-if.c b/linux/drivers/media/video/pwc/pwc-if.c
index fbe7ae2a9..a241a3060 100644
--- a/linux/drivers/media/video/pwc/pwc-if.c
+++ b/linux/drivers/media/video/pwc/pwc-if.c
@@ -133,7 +133,7 @@ static int default_fbufs = 3;   /* Default number of frame buffers */
 #endif
 static int power_save = 0;
 static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */
-       int pwc_preferred_compression = 1; /* 0..3 = uncompressed..high */
+static int pwc_preferred_compression = 1; /* 0..3 = uncompressed..high */
 static struct {
 	int type;
 	char serial_number[30];
@@ -1097,7 +1097,7 @@ static const char *pwc_sensor_type_to_string(unsigned int sensor_type)
 		case 0x101:
 			return "PAL MR sensor";
 		default:
-		    	return "unknown type of sensor";
+			return "unknown type of sensor";
 	}
 }
 #endif
@@ -1744,10 +1744,10 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
 		     (device_hint[hint].pdev == NULL)) {
 			/* so far, so good... try serial number */
 			if ((device_hint[hint].serial_number[0] == '*') || !strcmp(device_hint[hint].serial_number, serial_number)) {
-			    	/* match! */
-			    	video_nr = device_hint[hint].device_node;
-			    	PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr);
-			    	break;
+				/* match! */
+				video_nr = device_hint[hint].device_node;
+				PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr);
+				break;
 			}
 		}
 	}
diff --git a/linux/drivers/media/video/pwc/pwc-v4l.c b/linux/drivers/media/video/pwc/pwc-v4l.c
index 86faadd48..bd918b87c 100644
--- a/linux/drivers/media/video/pwc/pwc-v4l.c
+++ b/linux/drivers/media/video/pwc/pwc-v4l.c
@@ -678,9 +678,9 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
 			break;
 		}
 
-	    	/* V4L2 Layer */
-	    	case VIDIOC_QUERYCAP:
-	    	{
+		/* V4L2 Layer */
+		case VIDIOC_QUERYCAP:
+		{
 		    struct v4l2_capability *cap = arg;
 
 		    PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCAP) This application "\
@@ -696,8 +696,8 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
 		    return 0;
 		}
 
-	    	case VIDIOC_ENUMINPUT:
-	    	{
+		case VIDIOC_ENUMINPUT:
+		{
 		    struct v4l2_input *i = arg;
 
 		    if ( i->index )	/* Only one INPUT is supported */
@@ -708,14 +708,14 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
 		    return 0;
 		}
 
-	    	case VIDIOC_G_INPUT:
+		case VIDIOC_G_INPUT:
 		{
 		    int *i = arg;
 		    *i = 0;	/* Only one INPUT is supported */
 		    return 0;
 		}
-	    	case VIDIOC_S_INPUT:
-	    	{
+		case VIDIOC_S_INPUT:
+		{
 			int *i = arg;
 
 			if ( *i ) {	/* Only one INPUT is supported */
@@ -727,7 +727,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
 		}
 
 		/* TODO: */
-	    	case VIDIOC_QUERYCTRL:
+		case VIDIOC_QUERYCTRL:
 		{
 			struct v4l2_queryctrl *c = arg;
 			int i;
@@ -965,13 +965,13 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
 
 		case VIDIOC_ENUM_FMT:
 		{
-		    	struct v4l2_fmtdesc *f = arg;
+			struct v4l2_fmtdesc *f = arg;
 			int index;
 
 			if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
 			      return -EINVAL;
 
-		    	/* We only support two format: the raw format, and YUV */
+			/* We only support two format: the raw format, and YUV */
 			index = f->index;
 			memset(f,0,sizeof(struct v4l2_fmtdesc));
 			f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -980,23 +980,23 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
 			{
 				case 0:
 					/* RAW format */
-			    		f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2;
+					f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2;
 					f->flags = V4L2_FMT_FLAG_COMPRESSED;
-			    		strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description));
+					strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description));
 					break;
 				case 1:
-			    		f->pixelformat = V4L2_PIX_FMT_YUV420;
-			    		strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description));
+					f->pixelformat = V4L2_PIX_FMT_YUV420;
+					strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description));
 					break;
-			    	default:
+				default:
 					return -EINVAL;
 			}
 			return 0;
 		}
 
-	    	case VIDIOC_G_FMT:
+		case VIDIOC_G_FMT:
 		{
-		    	struct v4l2_format *f = arg;
+			struct v4l2_format *f = arg;
 
 			PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",pdev->image.x,pdev->image.y);
 			if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -1010,7 +1010,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
 		case VIDIOC_TRY_FMT:
 			return pwc_vidioc_try_fmt(pdev, arg);
 
-	    	case VIDIOC_S_FMT:
+		case VIDIOC_S_FMT:
 			return pwc_vidioc_set_fmt(pdev, arg);
 
 		case VIDIOC_G_STD:
diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h
index a087108d0..629f79e44 100644
--- a/linux/drivers/media/video/pwc/pwc.h
+++ b/linux/drivers/media/video/pwc/pwc.h
@@ -274,7 +274,6 @@ extern "C" {
 #if CONFIG_PWC_DEBUG
 extern int pwc_trace;
 #endif
-extern int pwc_preferred_compression;
 extern int pwc_mbufs;
 
 /** functions in pwc-if.c */
@@ -308,7 +307,6 @@ extern int pwc_set_gamma(struct pwc_device *pdev, int value);
 extern int pwc_get_saturation(struct pwc_device *pdev, int *value);
 extern int pwc_set_saturation(struct pwc_device *pdev, int value);
 extern int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value);
-extern int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value);
 extern int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor);
 extern int pwc_restore_user(struct pwc_device *pdev);
 extern int pwc_save_user(struct pwc_device *pdev);
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index eac8bfba9..16685386c 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -69,11 +69,11 @@ struct saa6752hs_state {
 
 enum saa6752hs_command {
 	SAA6752HS_COMMAND_RESET = 0,
-    	SAA6752HS_COMMAND_STOP = 1,
-    	SAA6752HS_COMMAND_START = 2,
-    	SAA6752HS_COMMAND_PAUSE = 3,
-    	SAA6752HS_COMMAND_RECONFIGURE = 4,
-    	SAA6752HS_COMMAND_SLEEP = 5,
+	SAA6752HS_COMMAND_STOP = 1,
+	SAA6752HS_COMMAND_START = 2,
+	SAA6752HS_COMMAND_PAUSE = 3,
+	SAA6752HS_COMMAND_RECONFIGURE = 4,
+	SAA6752HS_COMMAND_SLEEP = 5,
 	SAA6752HS_COMMAND_RECONFIGURE_FORCE = 6,
 
 	SAA6752HS_COMMAND_MAX
@@ -252,19 +252,19 @@ static int saa6752hs_set_bitrate(struct i2c_client* client,
 	if (params->vi_bitrate.mode == V4L2_BITRATE_VBR) {
 		/* set the target bitrate */
 		buf[0] = 0x80;
-	    	buf[1] = params->vi_bitrate.target >> 8;
+		buf[1] = params->vi_bitrate.target >> 8;
 		buf[2] = params->vi_bitrate.target & 0xff;
 		i2c_master_send(client, buf, 3);
 
 		/* set the max bitrate */
 		buf[0] = 0x81;
-	    	buf[1] = params->vi_bitrate.max >> 8;
+		buf[1] = params->vi_bitrate.max >> 8;
 		buf[2] = params->vi_bitrate.max & 0xff;
 		i2c_master_send(client, buf, 3);
 	} else {
 		/* set the target bitrate (no max bitrate for CBR) */
 		buf[0] = 0x81;
-	    	buf[1] = params->vi_bitrate.target >> 8;
+		buf[1] = params->vi_bitrate.target >> 8;
 		buf[2] = params->vi_bitrate.target & 0xff;
 		i2c_master_send(client, buf, 3);
 	}
@@ -406,22 +406,22 @@ static int saa6752hs_init(struct i2c_client* client)
 	buf[2] = 0x0D;
 	i2c_master_send(client,buf,3);
 
-    	/* Set minimum Q-scale {4} */
+	/* Set minimum Q-scale {4} */
 	buf[0] = 0x82;
 	buf[1] = 0x04;
 	i2c_master_send(client,buf,2);
 
-    	/* Set maximum Q-scale {12} */
+	/* Set maximum Q-scale {12} */
 	buf[0] = 0x83;
 	buf[1] = 0x0C;
 	i2c_master_send(client,buf,2);
 
-    	/* Set Output Protocol */
+	/* Set Output Protocol */
 	buf[0] = 0xD0;
 	buf[1] = 0x81;
 	i2c_master_send(client,buf,2);
 
-    	/* Set video output stream format {TS} */
+	/* Set video output stream format {TS} */
 	buf[0] = 0xB0;
 	buf[1] = 0x05;
 	i2c_master_send(client,buf,2);
@@ -452,7 +452,7 @@ static int saa6752hs_init(struct i2c_client* client)
 	localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF;
 	localPMT[sizeof(PMT) - 1] = crc & 0xFF;
 
-    	/* Set Audio PID */
+	/* Set Audio PID */
 	buf[0] = 0xC1;
 	buf[1] = (h->params.ts_pid_audio >> 8) & 0xFF;
 	buf[2] = h->params.ts_pid_audio & 0xFF;
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c
index fefcce8f6..7807397a5 100644
--- a/linux/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c
@@ -926,7 +926,7 @@ static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol,
 				break;
 		}
 
-	    	/* output xbar always main channel */
+		/* output xbar always main channel */
 		saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10);
 
 		if (left || right) { // We've got data, turn the input on
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 04812f5f8..389f05b3c 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -2161,7 +2161,7 @@ struct saa7134_board saa7134_boards[] = {
 		.radio = {
 			  .name = name_radio,
 			  .amux = LINE2,
-    		},
+		},
 	},
 	[SAA7134_BOARD_GOTVIEW_7135] = {
 		/* Mike Baikov <mike@baikov.com> */
@@ -2882,6 +2882,55 @@ struct saa7134_board saa7134_boards[] = {
 			.gpio = 0x000000,	/* GPIO21=Low for FM radio antenna */
 		},
 	},
+	[SAA7134_BOARD_FLYVIDEO3000_NTSC] = {
+		/* "Zac Bowling" <zac@zacbowling.com> */
+		.name           = "LifeView FlyVIDEO3000 (NTSC)",
+		.audio_clock    = 0x00200000,
+		.tuner_type     = TUNER_PHILIPS_NTSC,
+		.radio_type     = UNSET,
+		.tuner_addr     = ADDR_UNSET,
+		.radio_addr     = ADDR_UNSET,
+
+		.gpiomask       = 0xe000,
+		.inputs         = {{
+			.name = name_tv,
+			.vmux = 1,
+			.amux = TV,
+			.gpio = 0x8000,
+			.tv   = 1,
+		},{
+			.name = name_tv_mono,
+			.vmux = 1,
+			.amux = LINE2,
+			.gpio = 0x0000,
+			.tv   = 1,
+		},{
+			.name = name_comp1,
+			.vmux = 0,
+			.amux = LINE2,
+			.gpio = 0x4000,
+		},{
+			.name = name_comp2,
+			.vmux = 3,
+			.amux = LINE2,
+			.gpio = 0x4000,
+		},{
+			.name = name_svideo,
+			.vmux = 8,
+			.amux = LINE2,
+			.gpio = 0x4000,
+		}},
+		.radio = {
+			.name = name_radio,
+			.amux = LINE2,
+			.gpio = 0x2000,
+		},
+			.mute = {
+			.name = name_mute,
+			.amux = TV,
+			.gpio = 0x8000,
+		},
+	},
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2941,6 +2990,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
 	},{
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+		.subvendor    = 0x5169,
+		.subdevice    = 0x0138,
+		.driver_data  = SAA7134_BOARD_FLYVIDEO3000_NTSC,
+	},{
+		.vendor       = PCI_VENDOR_ID_PHILIPS,
+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
 		.subvendor    = 0x5168,
 		.subdevice    = 0x0138,
 		.driver_data  = SAA7134_BOARD_FLYVIDEO3000,
@@ -3536,6 +3591,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
 	switch (dev->board) {
 	case SAA7134_BOARD_FLYVIDEO2000:
 	case SAA7134_BOARD_FLYVIDEO3000:
+	case SAA7134_BOARD_FLYVIDEO3000_NTSC:
 		dev->has_remote = SAA7134_REMOTE_GPIO;
 		board_flyvideo(dev);
 		break;
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index c30d512c7..672a980cb 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -231,6 +231,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_AVERMEDIA_A169_B1 92
 #define SAA7134_BOARD_MD7134_BRIDGE_2     93
 #define SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS 94
+#define SAA7134_BOARD_FLYVIDEO3000_NTSC 95
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
diff --git a/linux/drivers/media/video/tda9875.c b/linux/drivers/media/video/tda9875.c
index 42f28e6b0..279f1ecd7 100644
--- a/linux/drivers/media/video/tda9875.c
+++ b/linux/drivers/media/video/tda9875.c
@@ -185,7 +185,7 @@ static void do_tda9875_init(struct i2c_client *client)
 	struct tda9875 *t = i2c_get_clientdata(client);
 	dprintk("In tda9875_init\n");
 	tda9875_write(client, TDA9875_CFG, 0xd0 ); /*reg de config 0 (reset)*/
-    	tda9875_write(client, TDA9875_MSR, 0x03 );    /* Monitor 0b00000XXX*/
+	tda9875_write(client, TDA9875_MSR, 0x03 );    /* Monitor 0b00000XXX*/
 	tda9875_write(client, TDA9875_C1MSB, 0x00 );  /*Car1(FM) MSB XMHz*/
 	tda9875_write(client, TDA9875_C1MIB, 0x00 );  /*Car1(FM) MIB XMHz*/
 	tda9875_write(client, TDA9875_C1LSB, 0x00 );  /*Car1(FM) LSB XMHz*/
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index 0b82156ed..f3cbe151d 100644
--- a/linux/drivers/media/video/tuner-simple.c
+++ b/linux/drivers/media/video/tuner-simple.c
@@ -114,7 +114,7 @@ static int tuner_stereo(struct i2c_client *c)
 
 	switch (t->type) {
 		case TUNER_PHILIPS_FM1216ME_MK3:
-    		case TUNER_PHILIPS_FM1236_MK3:
+		case TUNER_PHILIPS_FM1236_MK3:
 		case TUNER_PHILIPS_FM1256_IH3:
 			stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
 			break;
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c
index c1697f045..c701982cf 100644
--- a/linux/drivers/media/video/v4l2-common.c
+++ b/linux/drivers/media/video/v4l2-common.c
@@ -506,9 +506,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
 				prt_names(p->memory,v4l2_memory_names),
 				p->m.userptr);
 		printk ("%s: timecode= %02d:%02d:%02d type=%d, "
-			"flags=0x%08x, frames=%d, userbits=0x%p\n",
+			"flags=0x%08x, frames=%d, userbits=0x%08x\n",
 				s,tc->hours,tc->minutes,tc->seconds,
-				tc->type, tc->flags, tc->frames, tc->userbits);
+				tc->type, tc->flags, tc->frames, *(__u32 *) tc->userbits);
 		break;
 	}
 	case VIDIOC_QUERYCAP:
diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c
index 9241cf5be..976ce381b 100644
--- a/linux/drivers/media/video/videodev.c
+++ b/linux/drivers/media/video/videodev.c
@@ -342,7 +342,7 @@ static void dbgbuf(unsigned int cmd, struct video_device *vfd,
 	dbgarg2 ("timecode= %02d:%02d:%02d type=%d, "
 		"flags=0x%08d, frames=%d, userbits=0x%08x\n",
 			tc->hours,tc->minutes,tc->seconds,
-			tc->type, tc->flags, tc->frames, (__u32) tc->userbits);
+			tc->type, tc->flags, tc->frames, *(__u32 *) tc->userbits);
 }
 
 static inline void dbgrect(struct video_device *vfd, char *s,
diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c
index 5fd42153f..614cdc60e 100644
--- a/linux/drivers/media/video/vivi.c
+++ b/linux/drivers/media/video/vivi.c
@@ -1092,7 +1092,7 @@ static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf)
 }
 #endif
 
-int vidioc_streamon (struct file *file, void *priv, enum v4l2_buf_type i)
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
 {
 	struct vivi_fh  *fh=priv;
 	struct vivi_dev *dev    = fh->dev;
@@ -1107,7 +1107,7 @@ int vidioc_streamon (struct file *file, void *priv, enum v4l2_buf_type i)
 	return (videobuf_streamon(&fh->vb_vidq));
 }
 
-int vidioc_streamoff (struct file *file, void *priv, enum v4l2_buf_type i)
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
 {
 	struct vivi_fh  *fh=priv;
 	struct vivi_dev *dev    = fh->dev;
diff --git a/v4l/Makefile b/v4l/Makefile
index d20e68d4e..663369674 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -17,7 +17,12 @@ else
 ifneq ($(SRCDIR),)
 KDIR := $(SRCDIR)
 else
+ifneq ($(KERNELRELEASE),)
 KDIR := /lib/modules/$(KERNELRELEASE)/build
+else
+KDIR := /lib/modules/$(shell uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("%s.%s.%s%s\n",$$1,$$2,$$3,$$4); };')/build
+
+endif
 endif
 
 endif
@@ -133,9 +138,6 @@ remove rminstall:: media-rminstall ivtv-rminstall
 #################################################
 # Compiling preparation rules
 
-Makefile.media:: .version
-	scripts/make_makefile.pl
-
 .version::
 ifneq ($(KERNELRELEASE),)
 	@echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
@@ -147,28 +149,32 @@ else
 	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 endif
 
+Makefile.media:: .version
+	scripts/make_makefile.pl $(KDIR)
+
 release::
 ifneq ($(VER),)
 	@echo "Forcing compiling to version $(VER)."
 	@echo $(VER)|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 else
 ifneq ($(DIR),)
-	@perl -e 'open IN,"<$(DIR)/Makefile"; \
-		while (<IN>) { \
-			if (/^VERSION\s*=\s*([0-9]+)/){ $$version=$$1; next; }\
-			if (/^PATCHLEVEL\s*=\s*([0-9]+)/){ $$level=$$1; next; }\
-			if (/^SUBLEVEL\s*=\s*([0-9]+)/){ $$sublevel=$$1; next; }\
-			if (/^EXTRAVERSION\s*=\s*([^\s]+)\n/){ $$extra=$$1; next; }\
-		}; \
-		printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n", \
-		$$version,$$level,$$sublevel,$$version,$$level,$$sublevel,$$extra); \
-		printf ("SRCDIR:=$(DIR)\n");' > $(obj)/.version
+	@echo "Seeking for a version at $(DIR)/Makefile."
+	@perl \
+	-e 'open IN,"$(DIR)/Makefile"; ' \
+	-e 'while (<IN>) {' \
+	-e '	if (/^VERSION\s*=\s*([0-9]+)/){ $$version=$$1; }' \
+	-e '	elsif (/^PATCHLEVEL\s*=\s*([0-9]+)/){ $$level=$$1; }' \
+	-e '	elsif (/^SUBLEVEL\s*=\s*([0-9]+)/){ $$sublevel=$$1; }' \
+	-e '	elsif (/^EXTRAVERSION\s*=\s*([^\s]+)\n/){ $$extra=$$1; }' \
+	-e '};' \
+	-e 'printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",' \
+	-e '	$$version,$$level,$$sublevel,$$version,$$level,$$sublevel,$$extra);' \
+	-e 'printf ("SRCDIR:=$(DIR)\n");' > $(obj)/.version
 	@cat .version|grep KERNELRELEASE:|sed s,'KERNELRELEASE:=','Forcing compiling to version ',
 
 	@if [ ! -f $(DIR)/scripts/kallsyms ]; then \
 		echo "*** Warning: You should configure and build kernel before compiling V4L"; \
 	fi
-
 else
 	@echo "No version specified. Using `uname -r`."
 	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
@@ -181,20 +187,19 @@ links::
 	@find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \;
 
 config-compat.h:: .myconfig
-	@echo \#ifndef __CONFIG_COMPAT_H__ > config-compat.h
-	@echo \#define __CONFIG_COMPAT_H__ >> config-compat.h
-	@echo >> config-compat.h
-	@echo \#include \<linux\/config\.h\> >> config-compat.h
-	@echo >> config-compat.h
-	@grep "CONFIG\_" .myconfig | grep -v "\:\= n" | \
-		sed s/"CONFIG\_"/"\#undef CONFIG\_"/1 | \
-		sed s/"\:\= .*"/""/1 >> config-compat.h >> config-compat.h
-	@echo >> config-compat.h
-	@grep "CONFIG\_" .myconfig | grep -v "\:\= n" | \
-		sed s/"CONFIG\_"/"\#define CONFIG\_"/1 | \
-		sed s/"\:\="/""/1 >> config-compat.h >> config-compat.h
-	@echo >> config-compat.h
-	@echo \#endif >> config-compat.h
+	@perl \
+	-e 'print "#ifndef __CONFIG_COMPAT_H__\n";' \
+	-e 'print "#define __CONFIG_COMPAT_H__\n\n";' \
+	-e 'print "#include <linux/config.h>\n\n";' \
+	-e 'while(<>) {' \
+	-e '    next unless /^(\S+)\s*:= (\S+)$$/;' \
+	-e '    print "#undef $$1\n";' \
+	-e '       if($$2 eq "n") { next; }' \
+	-e '    elsif($$2 eq "m") { print "#define $$1_MODULE 1\n"; }' \
+	-e '    elsif($$2 eq "y") { print "#define $$1 1\n"; }' \
+	-e '    else              { print "#define $$1 $$2\n"; }' \
+	-e '} print "\n#endif\n";' \
+		< .myconfig > config-compat.h
 
 kernel-links makelinks::
 	cd ..;	v4l/scripts/makelinks.sh $(KDIR)
@@ -216,8 +221,9 @@ clean::
 
 distclean:: clean
 	-rm -f .version .*.o.flags .*.o.d Makefile.media \
-		Kconfig Kconfig.kern .config .config.cmd
+		Kconfig Kconfig.kern .config .config.cmd .myconfig
 	-rm -rf .tmp_versions
+	-rm -f scripts/lxdialog scripts/kconfig
 	@find .. -name '*.orig' -exec rm '{}' \;
 	@find .. -name '*.rej' -exec rm '{}' \;
 
@@ -250,29 +256,27 @@ LXDIALOG_DIR := $(shell if [ -d $(KDIR)/scripts/kconfig/lxdialog ]; then echo kc
 LXDIALOG_LNK := $(if $(LXDIALOG_DIR),scripts/kconfig,scripts/lxdialog)
 LXDIALOG := $(KDIR)/scripts/$(LXDIALOG_DIR)lxdialog/lxdialog
 
+.myconfig : .config
+	./scripts/make_myconfig.pl
+
 xconfig:: links .version $(QCONF)
-	./scripts/make_kconfig.pl
+	./scripts/make_kconfig.pl $(KDIR)
 	$(QCONF) Kconfig
-	./scripts/make_noconfig.pl
 
 gconfig:: links .version $(GCONF)
-	./scripts/make_kconfig.pl
+	./scripts/make_kconfig.pl $(KDIR)
 	$(QCONF) Kconfig
-	./scripts/make_noconfig.pl
 
 config:: links .version $(CONF)
-	./scripts/make_kconfig.pl
+	./scripts/make_kconfig.pl $(KDIR)
 	$(CONF) Kconfig
-	./scripts/make_noconfig.pl
 
 menuconfig:: links .version $(MCONF) lxdialog
-	./scripts/make_kconfig.pl
+	./scripts/make_kconfig.pl $(KDIR)
 	$(MCONF) Kconfig
-	./scripts/make_noconfig.pl
 
 allyesconfig allmodconfig:: links .version
-	./scripts/make_kconfig.pl 1
-	./scripts/make_noconfig.pl
+	./scripts/make_kconfig.pl $(KDIR) 1
 
 # rule to build kernel conf programs
 KMAKEVARS := config-targets=1 mixed-targets=0 dot-config=0
diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl
index 16e566ea9..3f8b4b0ba 100755
--- a/v4l/scripts/hghead.pl
+++ b/v4l/scripts/hghead.pl
@@ -12,6 +12,7 @@ my $sub_ok=0;
 my $init=0;
 my $num=0;
 my $hgimport=0;
+my $mmimport=0;
 my $maint_ok=0;
 my $noblank=1;
 my $maintainer_name=$ENV{CHANGE_LOG_NAME};
@@ -33,6 +34,10 @@ while ($line = <IN>) {
 	if ($line =~ m/^\-\-\- .*/) {
 		last;
 	}
+	if ($line =~ m/^\-\-\-\-.*/) {
+		$body="";
+		next;
+	}
 	if ($line =~ m/^\-\-\-.*/) {
 		last;
 	}
@@ -62,7 +67,11 @@ while ($line = <IN>) {
 			$from= "From: $fromname\n";
 			next;
 		}
-		print "Bad: author line have a wrong syntax\n";
+		if ($line =~ m/^From:\sakpm\@osdl.org/) {
+			$mmimport=1;
+			next;
+		}
+		print "Bad: author line have a wrong syntax: $line\n";
 		die;
 	}
 
@@ -87,11 +96,11 @@ while ($line = <IN>) {
 		$signed="$signed$line";
 		next;
 	}
-	if ($line =~ m/^\# HG changeset patch/) {
+	if ( ($line =~ m/^\# HG changeset patch/) ||
+	     ($line =~ m/^has been added to the -mm tree.  Its filename is/) ) {
 		$sub_ok=0;
 		$init=0;
 		$num=0;
-		$hgimport=0;
 		$maint_ok=0;
 		$noblank=1;
 		$from="";
@@ -100,6 +109,7 @@ while ($line = <IN>) {
 		$hgimport=1;
 		next;
 	}
+
 		
 	if ($line =~ m/^Acked-by:.*/) {
 		$signed="$signed$line";
@@ -164,8 +174,8 @@ if (!$signed =~ m/$from/) {
 	die;
 }
 
-$body=~s/\n+$//;
-$body=~s/^\n+$//;
+$body=~s/[\n\s]+$//;
+$body=~s/^[\n\s]+//;
 
 # First from is used by hg to recognize commiter name
 print "#Committer: $maintainer_name <$maintainer_email>\n";
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index b499fefa1..c58f5b028 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -7,10 +7,69 @@ my %config = ();
 my %intopt = ();
 my %hexopt = ();
 my %tristate = ();
+my %kernopts = ();
+my %depmods = ();
 my $version, $level, $sublevel;
 
+my $kernel=shift;
 my $force_kconfig=shift;
 
+#!/usr/bin/perl
+use FileHandle;
+
+###########################################################
+# Checks config.h and autoconf.h for current kernel defines
+sub process_config ($)
+{
+	my $filename = shift;
+        my $in = new FileHandle;
+
+	open $in,"$kernel/include/$filename" or die;
+	while (<$in>) {
+	        if (m|\#include\s+\<(.*)\>|) {
+			process_config ($1);
+			next;
+	        }
+		if (m/\#define\s+CONFIG_([^ ]*)_ON_SMP\s+(.*)\n/) {
+			my $key=$1;
+			my $value=$2;
+#			printf "defined $key as $value\n";
+			if ( $value == 1 ) {
+				$value='y';
+			}
+			$kernopts{$key}=$value;
+			next;
+		}
+		if (m/\#define\s+CONFIG_([^ ]*)_MODULE\s+(.*)\n/) {
+			my $key=$1;
+			my $value=$2;
+#			printf "defined $key as $value\n";
+			if ( $value == 1 ) {
+				$value='m';
+			}
+			$kernopts{$key}=$value;
+			next;
+		}
+		if (m/\#define\s+CONFIG_([^ ]*)\s+(.*)\n/) {
+			my $key=$1;
+			my $value=$2;
+#			printf "defined $key as $value\n";
+			if ( $value == 1 ) {
+				$value='y';
+			}
+			$kernopts{$key}=$value;
+			next;
+		}
+		if (m/\#undef\s+CONFIG_([^ ]*)\n/) {
+#			printf "undefined $1\n";
+			$kernopts{$1}='n';
+			next;
+		}
+	}
+
+	close $in;
+}
+
 sub add_bool($)
 {
 	my $arg=shift;
@@ -18,6 +77,8 @@ sub add_bool($)
 	exists $config{$arg} or die "Adding unknown boolean '$arg'";
 	$tristate{$arg}="bool";
 #	printf "Boolean:%s\n",$arg;
+
+	$kernopts{$arg}='y';
 }
 
 sub add_tristate($)
@@ -26,7 +87,8 @@ sub add_tristate($)
 
 	exists $config{$arg} or die "Adding unknown tristate '$arg'";
 	$tristate{$arg}="tristate";
-#	printf "Tristate:%s\n",$arg;
+
+	$kernopts{$arg}='m';
 }
 
 sub add_int($)
@@ -75,6 +137,7 @@ sub add_config($)
 	}
 }
 
+########################################
 # Turn option off, iff it already exists
 sub disable_config($)
 {
@@ -83,9 +146,14 @@ sub disable_config($)
 	$config{$key} = 0 if (exists $config{$key});
 }
 
-sub check_deps($)
+#################################################################
+# Make a list of dependencies and the number of references for it
+sub check_deps($$)
 {
+	my $key=shift;
 	my $arg=shift;
+
+	$depmods{$key}=$arg;
 	$arg=$arg." ";
 
 	while ($arg ne "") {
@@ -96,6 +164,44 @@ sub check_deps($)
 		}
 		$arg =~ s/^[^ ]+ //;
 	}
+
+	return $ok;
+}
+
+######################################################
+# Checks if all dependencies for the key are satisfied
+sub deps_ok($)
+{
+	my $key=shift;
+	my $arg=$depmods{$key};
+	my $ok=1;
+
+	if ($arg eq "") {
+		return $ok;
+	}
+
+	$arg=$arg." ";
+
+
+#	printf "$key: deps are '$arg'\n";
+
+	while ($arg ne "") {
+		if ($arg =~ m/^([A-Z0-9_]+) /) {
+			if ((! exists $kernopts {$1}) || ($kernopts {$1} eq 'n')) {
+				printf "$key: Required kernel opt '$1' is not present\n";
+				$ok=0;
+			}
+		}
+		if ($arg =~ m/^\!([A-Z0-9_]+) /) {
+			if ($kernopts {$1} eq 'y') {
+				printf "$key: Driver is incompatible with  '$1'\n";
+				$ok=0;
+			}
+		}
+		$arg =~ s/^[^ ]+ //;
+	}
+
+	return $ok;
 }
 
 sub open_kconfig($$) {
@@ -105,7 +211,7 @@ sub open_kconfig($$) {
 	my $key;
 
 #print "opening $file\n";
-	open $in,"$file";
+	open $in,"$file" or die;
 	while (<$in>) {
 #		if (m;^\s*source[\s\"]+drivers/media/(video|dvb)/Kconfig;) {
 #			next;
@@ -124,10 +230,10 @@ sub open_kconfig($$) {
 			next;
 		}
 		if (m|^\s+depends on\s+(.*)\n|) {
-			check_deps ($1);
+			check_deps ($key,$1);
 		}
 		if (m|^\s+select\s+(.*)\n|) {
-			check_deps ($1);
+			check_deps ($key,$1);
 		}
 		if (m|^\s+bool(ean)?\s|) {
 			add_bool($key);
@@ -155,7 +261,6 @@ sub open_kconfig($$) {
 			$default_seen = 1;
 			$_ = "\tdefault n\n";
 		}
-
 		# check for end of config definition for disabled drivers
 		# we need to make sure we've disabled it, and add a bit
 		# to the help text
@@ -211,7 +316,7 @@ sub parse_versions ()
 	my $in = new FileHandle;
 	my $ver;
 
-	open $in,"versions.txt";
+	open $in,"versions.txt" or die;
 	while (<$in>) {
 		if (m/\[([\d.]*)\]/) {
 			$ver=$1;
@@ -226,9 +331,11 @@ sub parse_versions ()
 	close $in;
 }
 
+process_config("linux/config.h");
+
 parse_versions;
 
-open IN,".version";
+open IN,".version" or die;
 while (<IN>) {
 	if (m/KERNELRELEASE\s*[:]*[=]+\s*(\d+)\.(\d+)\.(\d+)/) {
 		$version=$1;
@@ -240,7 +347,7 @@ close IN;
 
 printf "Preparing to compile for kernel version %d.%d.%d\n",$version,$level,$sublevel;
 
-open OUT,">Kconfig";
+open OUT,">Kconfig" or die;
 
 print OUT <<"EOF";
 mainmenu "V4L/DVB menu"
@@ -273,14 +380,19 @@ while ( my ($key, $value) = each(%config) ) {
 		delete $depend{$key};
 }
 
-open OUT,">Kconfig.kern";
+open OUT,">Kconfig.kern" or die;
 
 print OUT "config MODULES\n\tboolean\n\tdefault y\n\n";
 add_config('MODULES');
 add_bool('MODULES');
 
 while ( my ($key, $value) = each(%depend) ) {
-	print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n";
+	if ($kernopts{$key}) {
+		print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault ".
+			$kernopts{$key}."\n\n";
+	} else {
+		print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault n #not found\n\n";
+	}
 }
 close OUT;
 
@@ -288,12 +400,62 @@ close OUT;
 disable_config('DVB_AV7110_FIRMWARE');
 disable_config('DVB_CINERGYT2_TUNING');
 
+# Hack for check sound/oss/aci.h header
+
+my $mirodep="$kernel/sound/oss/aci.h";
+if (!open IN, $mirodep) {
+	my $key="RADIO_MIROPCM20";
+print <<"EOF2";
+$key: $mirodep is missing.
+
+***WARNING:*** You do not have the full kernel sources installed.
+This does not prevent you from building the v4l-dvb tree if you have the 
+kernel headers, but the full kernel source is required in order to use 
+make menuconfig / xconfig / qconfig.
+
+If you are experiencing problems building the v4l-dvb tree, please try 
+building against a vanilla kernel before reporting a bug.
+
+Vanilla kernels are available at http://kernel.org.
+On most distros, this will compile a newly downloaded kernel:
+
+cp /boot/config-`uname -r` <your kernel dir>/.config
+cd <your kernel dir>
+make all modules_install install
+
+Please see your distro's web site for instructions to build a new kernel.
+
+EOF2
+	$kernopts{$key}='n';
+}
+close IN;
+
+# Recursively check for broken dependencies
+my $i;
+do {
+	$i=0;
+	while ( my ($key,$value) = each(%kernopts) ) {
+		if ($value ne 'n') {
+			if (!deps_ok($key)) {
+				$kernopts{$key}='n';
+			}
+			$i=$i+1;
+		}
+	}
+} until (!$disable);
+
 # Produce a .config file if it's forced or one doesn't already exist
 if (($force_kconfig eq 1) || !open IN,".config") {
-	open OUT,">.config";
+	open OUT,">.config" or die;
 	while ( my ($key,$value) = each(%tristate) ) {
 		if (!$config{$key}) {
-			print OUT "CONFIG_$key=n\n";
+			print OUT "# CONFIG_$key is not set\n";
+		} elsif ($kernopts{$key}) {
+			if ($kernopts{$key} eq 'n') {
+				print OUT "# CONFIG_$key is not set\n";
+			} else {
+				print OUT "CONFIG_$key=".$kernopts{$key}."\n";
+			}
 		} elsif ($value eq 'tristate') {
 			print OUT "CONFIG_$key=m\n";
 		} else { # must be 'bool'
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 238c5082f..e0a099e9b 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 use FileHandle;
 
+my $kernel=shift;
 my $instdir = ();
 
 sub check_line($$$)
@@ -109,7 +110,7 @@ sub open_makefile($) {
 	close $in;
 }
 
-open OUT,">Makefile.media";
+open OUT,">Makefile.media.new";
 open_makefile ("../linux/drivers/media/Makefile");
 
 # Creating Install rule
@@ -156,8 +157,30 @@ while ( my ($key, $value) = each(%depend) ) {
 }
 close OUT;
 
-if (open OUT,".myconfig") {
+if (open IN,"Makefile.media") {
+	close IN;
+	my $changed=0;
+	if (open IN,"diff Makefile.media Makefile.media.new|") {
+		while (<IN>) {
+			if ($_ ne "") {
+				$changed=1;
+			}
+		}
+		close IN;
+		if ($changed) {
+			printf("One or more linux Makefiles had changed. Makefile.media rewrited.\n");
+			system ("mv Makefile.media.new Makefile.media");
+		} else {
+			system ("rm Makefile.media.new");
+		}
+	}
+} else {
+	printf("Creating Makefile.media.\n");
+	system "mv Makefile.media.new Makefile.media";
+}
+
+if (open IN,".myconfig") {
 	close IN;
 } else {
-	system "make allmodconfig";
+	system "./scripts/make_kconfig.pl $kernel 1";
 }
diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_myconfig.pl
index 7323f419c..7323f419c 100755
--- a/v4l/scripts/make_noconfig.pl
+++ b/v4l/scripts/make_myconfig.pl
diff --git a/v4l/scripts/prep_commit_msg.pl b/v4l/scripts/prep_commit_msg.pl
index ac958667b..a4594c7f9 100755
--- a/v4l/scripts/prep_commit_msg.pl
+++ b/v4l/scripts/prep_commit_msg.pl
@@ -1,34 +1,59 @@
 #!/usr/bin/perl
 
-$f=shift; 
-open IN,"hg diff|diffstat -p1 |"; 
-my $n=2;
-my $from="";
-my $first="";
-my $changed="";
-$out="";
-while (<IN>) {
-	$changed="$changed#$_";
-}
+my $autopatch = shift;
 
+# Get Hg username from environment
 my $user = $ENV{HGUSER};
 
-if ( $user eq "" ) {
+# Didn't work? Try the .hgrc file
+if ($user eq "") {
+	open IN, "<$ENV{HOME}/.hgrc";
+	while (<IN>) {
+		if(/^\s*username\s*=\s*(\S.*)$/) {
+			$user = $1;
+			last;
+		}
+	}
+	close IN;
+}
+
+# Still no luck? Try some other environment variables
+if ($user eq "") {
 	my $name = $ENV{CHANGE_LOG_NAME};
 	my $email = $ENV{CHANGE_LOG_EMAIL_ADDRESS};
+	$user = "$name <$email>" if ($name ne "" || $email ne "");
+}
+
+# Last try to come up with something
+if ($user eq "") {
+	$user = "$ENV{USER} <>";
+}
 
-	$user="$name <$email>";
+print "# Added/removed/changed files:\n";
+system "hg diff | diffstat -p1 -c";
+if (-s $autopatch) {
+	print "#\n# Note, a problem with your patch was detected!  These changes were made\n";
+	print "# automatically: $autopatch\n";
+	system "diffstat -p0 -c $autopatch";
+	print "#\n# Please review these changes and see if they belong in your patch or not.\n";
 }
+print <<"EOF";
+#
+# For better log display, please keep a blank line after subject, after from,
+# and before signed-off-by.
+# First line should be the subject, without Subject:
+#
+
+
+# Now, patch author (just the main one), on a From: field
+# Please change below if the committer is not the patch author.
+#
+From: $user
+
+# Then a detailed description:
+
 
-$first= "# Please change below if you are not patch author\n#\nFrom: $user";
-$out= "# At the end Signed-off-by: fields by patch author and committer, at least\n#\nSigned-off-by: $user";
-$from= "From: $user";
-
-printf  "#Added/removed/changed files:\n%s#\n" .
-	"# For better log display, please keep a blank line after subject, after from\n" .
-	"# and before signed-off-by\n" .
-	"# First line should be the subject, without Subject:\n#\n\n\n" .
-	"# Now, patch author (just the main one), on a From: field\n" .
-	"# Please change below if the committer is not the patch author\n#\n%s\n\n" .
-	"# Then a detailed description:\n\n\n%s",
-	$changed,$from,$out;
+# At the end Signed-off-by: fields by patch author and committer, at least.
+#
+Signed-off-by: $user
+EOF
diff --git a/v4l/scripts/strip-trailing-whitespaces.sh b/v4l/scripts/strip-trailing-whitespaces.sh
index 1a23e436d..a546a0b9f 100755
--- a/v4l/scripts/strip-trailing-whitespaces.sh
+++ b/v4l/scripts/strip-trailing-whitespaces.sh
@@ -1,37 +1,28 @@
 #!/bin/sh
+# Strips trailing whitespace.  Leading spaces and spaces after tabs are
+# converted to the equivalent sequence of tabs only.
 
-# tmp dir for my files
-WORK="${TMPDIR-/tmp}/${0##*/}-$$"
-mkdir "$WORK" || exit 1
-trap 'rm -rf "$WORK"' EXIT
+# Use the option "fast" to only check files Hg thinks are new or modified.
+# The option "manifest" will use Hg's manifest command to check all files
+# under Hg revision control.
+# Otherwise, all files under the linux tree are checked, except files in CVS
+# directories and .cvsignore files. This is the historical behavior.
 
-for file in `find linux -type d | grep -v CVS | grep -v .cvsignore` ; do
-    mkdir -p "$WORK/${file}"
-done
-for file in `find linux -type f | grep -v CVS | grep -v .cvsignore` ; do
-	tmpfile="$WORK/${file}.$$"
-	perl -ne 's/[ \t]+$//;
-        s/^\ \ \ \ \ \ \ \ /\t/; 
-        s/^\ \ \ \ \ \ \ \t/\t/; 
-        s/^\ \ \ \ \ \ \t/\t/; 
-        s/^\ \ \ \ \ \t/\t/; 
-        s/^\ \ \ \t/\t/; 
-        s/^\ \ \t/\t/; 
-        s/^\ \t/\t/;
-	$m=1;
-	while ($m>0) {
-		$m=0;
-	        $m=   s/\t\ \ \ \ \ \ \ \ /\t\t/g; 
-	        $m=$m+s/\t\ \ \ \ \ \ \ \t/\t\t/g; 
-	        $m=$m+s/\t\ \ \ \ \ \ \t/\t\t/g; 
-	        $m=$m+s/\t\ \ \ \ \ \t/\t\t/g; 
-	        $m=$m+s/\t\ \ \ \t/\t\t/g; 
-		$m=$m+s/\t\ \ \t/\t\t/g; 
-	        $m=$m+s/\t\ \t/\t\t/g;
-	}
-	print' < "${file}" > "${tmpfile}"
-	diff -u "${file}" "${tmpfile}" | sed 		\
-		-e "s|^--- ${file}|--- ${file}.orig|"	\
-		-e "s|^+++ ${tmpfile}|+++ ${file}|"
-	rm -f "$tmpfile"
+
+if [ "x$1" = "xfast" ]; then
+	files="hg status -man"
+elif [ "x$1" = "xmanifest" ]; then
+	files="hg manifest | cut '-d ' -f3"
+else
+	files="find linux -name CVS -prune -o -type f -not -name .cvsignore -print"
+fi
+
+for file in `eval $files`; do
+	perl -ne '
+	s/[ \t]+$//;
+	s<^ {8}> <\t>;
+	s<^ {1,7}\t> <\t>;
+	while( s<\t {8}> <\t\t>g || s<\t {1,7}\t> <\t\t>g ) {};
+	print' < "${file}" | \
+		diff -u --label="$file" "$file" --label="$file" -
 done
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 35cb44fc6..6da410612 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -6,10 +6,6 @@ VIDEO_ZR36120
 # This is also marked as broken
 VIDEO_PLANB
 
-# Those are architecture-dependent
-VIDEO_VINO
-VIDEO_M32R_AR_M64278
-
 [2.6.16]
 VIDEO_USBVIDEO
 USB_VICAM
@@ -23,6 +19,10 @@ USB_ZC0301
 VIDEO_ZORAN_AVS6EYES
 VIDEO_TLV320AIC23B
 
+# Those are architecture-dependent
+VIDEO_VINO
+VIDEO_M32R_AR_M64278
+
 [2.6.14]
 VIDEO_ZORAN
 VIDEO_ZORAN_BUZ