26 files changed, 112 insertions, 134 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 85888a8a93c9..6b4197018561 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -2,10 +2,10 @@
 # Multimedia Video device configuration
 #
 
-menu "Video For Linux"
+menu "Video Capture Adapters"
         depends on VIDEO_DEV
 
-comment "Video Adapters"
+comment "Video Capture Adapters"
 
 config VIDEO_ADV_DEBUG
         bool "Enable advanced debug functionality"
@@ -16,11 +16,23 @@ config VIDEO_ADV_DEBUG
           V4L devices.
           In doubt, say N.
 
+config VIDEO_VIVI
+        tristate "Virtual Video Driver"
+        depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
+        select VIDEO_BUF
+        default n
+        ---help---
+          Enables a virtual video driver. This device shows a color bar
+          and a timestamp, as a real device would generate by using V4L2
+          api.
+          Say Y here if you want to test video apps or debug V4L devices.
+          In doubt, say N.
+
 source "drivers/media/video/bt8xx/Kconfig"
 
 config VIDEO_SAA6588
         tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards"
-        depends on VIDEO_DEV && I2C && VIDEO_BT848
+        depends on I2C && VIDEO_BT848
 
         help
           Support for  Radio Data System (RDS) decoder. This allows seeing
@@ -32,7 +44,7 @@ config VIDEO_SAA6588
 
 config VIDEO_PMS
         tristate "Mediavision Pro Movie Studio Video For Linux"
-        depends on VIDEO_DEV && ISA
+        depends on ISA && VIDEO_V4L1
         help
           Say Y if you have such a thing.
 
@@ -41,7 +53,7 @@ config VIDEO_PMS
 
 config VIDEO_PLANB
         tristate "PlanB Video-In on PowerMac"
-        depends on PPC_PMAC && VIDEO_DEV && BROKEN
+        depends on PPC_PMAC && VIDEO_V4L1 && BROKEN
         help
           PlanB is the V4L driver for the PowerMac 7x00/8x00 series video
           input hardware. If you want to experiment with this, say Y.
@@ -52,7 +64,7 @@ config VIDEO_PLANB
 
 config VIDEO_BWQCAM
         tristate "Quickcam BW Video For Linux"
-        depends on VIDEO_DEV && PARPORT
+        depends on PARPORT && VIDEO_V4L1
         help
           Say Y have if you the black and white version of the QuickCam
           camera. See the next option for the color version.
@@ -62,7 +74,7 @@ config VIDEO_BWQCAM
 
 config VIDEO_CQCAM
         tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && VIDEO_DEV && PARPORT
+        depends on EXPERIMENTAL && PARPORT && VIDEO_V4L1
         help
           This is the video4linux driver for the colour version of the
           Connectix QuickCam.  If you have one of these cameras, say Y here,
@@ -73,7 +85,7 @@ config VIDEO_CQCAM
 
 config VIDEO_W9966
         tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux"
-        depends on PARPORT_1284 && VIDEO_DEV && PARPORT
+        depends on PARPORT_1284 && PARPORT && VIDEO_V4L1
         help
           Video4linux driver for Winbond's w9966 based Webcams.
           Currently tested with the LifeView FlyCam Supra.
@@ -86,7 +98,7 @@ config VIDEO_W9966
 
 config VIDEO_CPIA
         tristate "CPiA Video For Linux"
-        depends on VIDEO_DEV
+        depends on VIDEO_V4L1
         ---help---
           This is the video4linux driver for cameras based on Vision's CPiA
           (Colour Processor Interface ASIC), such as the Creative Labs Video
@@ -123,7 +135,7 @@ source "drivers/media/video/cpia2/Kconfig"
 
 config VIDEO_SAA5246A
         tristate "SAA5246A, SAA5281 Teletext processor"
-        depends on VIDEO_DEV && I2C
+        depends on I2C && VIDEO_V4L1
         help
           Support for I2C bus based teletext using the SAA5246A or SAA5281
           chip. Useful only if you live in Europe.
@@ -150,7 +162,7 @@ config TUNER_3036
 
 config VIDEO_VINO
         tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
-        depends on VIDEO_DEV && I2C && SGI_IP22 && EXPERIMENTAL
+        depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L1
         select I2C_ALGO_SGI
         help
           Say Y here to build in support for the Vino video input system found
@@ -158,7 +170,7 @@ config VIDEO_VINO
 
 config VIDEO_STRADIS
         tristate "Stradis 4:2:2 MPEG-2 video driver  (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && VIDEO_DEV && PCI
+        depends on EXPERIMENTAL && PCI && VIDEO_V4L1 && !PPC64
         help
           Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video
           driver for PCI.  There is a product page at
@@ -166,7 +178,7 @@ config VIDEO_STRADIS
 
 config VIDEO_ZORAN
         tristate "Zoran ZR36057/36067 Video For Linux"
-        depends on VIDEO_DEV && PCI && I2C_ALGOBIT
+        depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && !PPC64
         help
           Say Y for support for MJPEG capture cards based on the Zoran
           36057/36067 PCI controller chipset. This includes the Iomega
@@ -214,7 +226,7 @@ config VIDEO_ZORAN_LML33R10
 
 config VIDEO_ZR36120
         tristate "Zoran ZR36120/36125 Video For Linux"
-        depends on VIDEO_DEV && PCI && I2C && BROKEN
+        depends on PCI && I2C && VIDEO_V4L1 && BROKEN
         help
           Support for ZR36120/ZR36125 based frame grabber/overlay boards.
           This includes the Victor II, WaveWatcher, Video Wonder, Maxi-TV,
@@ -226,7 +238,7 @@ config VIDEO_ZR36120
 
 config VIDEO_MEYE
         tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
-        depends on VIDEO_DEV && PCI && SONYPI
+        depends on PCI && SONYPI && VIDEO_V4L1
         ---help---
           This is the video4linux driver for the Motion Eye camera found
           in the Vaio Picturebook laptops. Please read the material in
@@ -242,7 +254,7 @@ source "drivers/media/video/saa7134/Kconfig"
 
 config VIDEO_MXB
         tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
-        depends on VIDEO_DEV && PCI
+        depends on PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
         select VIDEO_TUNER
         ---help---
@@ -254,8 +266,9 @@ config VIDEO_MXB
 
 config VIDEO_DPC
         tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
-        depends on VIDEO_DEV && PCI
+        depends on PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
+        select VIDEO_V4L2
         ---help---
           This is a video4linux driver for the 'dpc7146 demonstration
           board' by Philips-Semiconductors. It's the reference design
@@ -268,8 +281,9 @@ config VIDEO_DPC
 
 config VIDEO_HEXIUM_ORION
         tristate "Hexium HV-PCI6 and Orion frame grabber"
-        depends on VIDEO_DEV && PCI
+        depends on PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
+        select VIDEO_V4L2
         ---help---
           This is a video4linux driver for the Hexium HV-PCI6 and
           Orion frame grabber cards by Hexium.
@@ -279,8 +293,9 @@ config VIDEO_HEXIUM_ORION
 
 config VIDEO_HEXIUM_GEMINI
         tristate "Hexium Gemini frame grabber"
-        depends on VIDEO_DEV && PCI
+        depends on PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
+        select VIDEO_V4L2
         ---help---
           This is a video4linux driver for the Hexium Gemini frame
           grabber card by Hexium. Please note that the Gemini Dual
@@ -293,7 +308,7 @@ source "drivers/media/video/cx88/Kconfig"
 
 config VIDEO_OVCAMCHIP
         tristate "OmniVision Camera Chip support"
-        depends on VIDEO_DEV && I2C
+        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
@@ -304,7 +319,7 @@ config VIDEO_OVCAMCHIP
 
 config VIDEO_M32R_AR
         tristate "AR devices"
-        depends on M32R
+        depends on M32R && VIDEO_V4L1
         ---help---
           This is a video4linux driver for the Renesas AR (Artificial Retina)
           camera module.
@@ -365,17 +380,17 @@ config VIDEO_WM8739
 source "drivers/media/video/cx25840/Kconfig"
 
 config VIDEO_SAA711X
-        tristate "Philips SAA7113/4/5 video decoders"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
+        tristate "Philips SAA7113/4/5 video decoders (OBSOLETED)"
+        depends on VIDEO_V4L1 && I2C && EXPERIMENTAL
         ---help---
-          Support for the Philips SAA7113/4/5 video decoders.
+          Old support for the Philips SAA7113/4 video decoders.
 
           To compile this driver as a module, choose M here: the
           module will be called saa7115.
 
 config VIDEO_SAA7127
         tristate "Philips SAA7127/9 digital video encoders"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
         ---help---
           Support for the Philips SAA7127/9 digital video encoders.
 
@@ -384,7 +399,7 @@ config VIDEO_SAA7127
 
 config VIDEO_UPD64031A
         tristate "NEC Electronics uPD64031A Ghost Reduction"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
         ---help---
           Support for the NEC Electronics uPD64031A Ghost Reduction
           video chip. It is most often found in NTSC TV cards made for
@@ -396,7 +411,7 @@ config VIDEO_UPD64031A
 
 config VIDEO_UPD64083
         tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
         ---help---
           Support for the NEC Electronics uPD64083 3-Dimensional Y/C
           separation video chip. It is used to improve the quality of
@@ -418,7 +433,7 @@ source "drivers/media/video/em28xx/Kconfig"
 
 config USB_DSBR
         tristate "D-Link USB FM radio support (EXPERIMENTAL)"
-        depends on USB && VIDEO_DEV && EXPERIMENTAL
+        depends on USB && VIDEO_V4L1 && EXPERIMENTAL
         ---help---
           Say Y here if you want to connect this type of radio to your
           computer's USB port. Note that the audio is not digital, and
@@ -434,7 +449,7 @@ source "drivers/media/video/et61x251/Kconfig"
 
 config USB_OV511
         tristate "USB OV511 Camera support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want to connect this type of camera to your
           computer's USB port. See <file:Documentation/video4linux/ov511.txt>
@@ -445,7 +460,7 @@ config USB_OV511
 
 config USB_SE401
         tristate "USB SE401 Camera support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want to connect this type of camera to your
           computer's USB port. See <file:Documentation/video4linux/se401.txt>
@@ -458,7 +473,7 @@ source "drivers/media/video/sn9c102/Kconfig"
 
 config USB_STV680
         tristate "USB STV680 (Pencam) Camera support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want to connect this type of camera to your
           computer's USB port. This includes the Pencam line of cameras.
@@ -470,7 +485,7 @@ config USB_STV680
 
 config USB_W9968CF
         tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-        depends on USB && VIDEO_DEV && I2C
+        depends on USB && VIDEO_V4L1 && I2C
         select VIDEO_OVCAMCHIP
         ---help---
           Say Y here if you want support for cameras based on OV681 or
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index b3ea2d63db9b..e5bf2687b76d 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -10,7 +10,11 @@ tuner-objs	:=	tuner-core.o tuner-types.o tuner-simple.o \
 
 msp3400-objs    :=      msp3400-driver.o msp3400-kthreads.o
 
-obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o compat_ioctl32.o
+obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o
+
+ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
+  obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
+endif
 
 obj-$(CONFIG_VIDEO_BT848) += bt8xx/
 obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o
@@ -84,4 +88,8 @@ obj-$(CONFIG_USB_IBMCAM)        += usbvideo/
 obj-$(CONFIG_USB_KONICAWC)      += usbvideo/
 obj-$(CONFIG_USB_VICAM)         += usbvideo/
 
+obj-$(CONFIG_VIDEO_VIVI) += vivi.o
+
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+extra-cflags-$(CONFIG_VIDEO_V4L1_COMPAT) += -DCONFIG_VIDEO_V4L1_COMPAT
+
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 085477c12612..153f6a4a96c9 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_BT848
         tristate "BT848 Video For Linux"
-        depends on VIDEO_DEV && PCI && I2C
+        depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_BTCX
diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile
index db641a36b197..a096a03418aa 100644
--- a/drivers/media/video/bt8xx/Makefile
+++ b/drivers/media/video/bt8xx/Makefile
@@ -8,5 +8,5 @@ bttv-objs      :=      bttv-driver.o bttv-cards.o bttv-if.o \
 
 obj-$(CONFIG_VIDEO_BT848) += bttv.o
 
-EXTRA_CFLAGS += -I$(src)/..
+EXTRA_CFLAGS += -Idrivers/media/video
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index f209a7492051..2b64aa835b42 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -2991,13 +2991,13 @@ void __devinit bttv_idcard(struct bttv *btv)
 
         if (UNSET != audiomux[0]) {
                 gpiobits = 0;
-                for (i = 0; i < 5; i++) {
+                for (i = 0; i < 4; i++) {
                         bttv_tvcards[btv->c.type].gpiomux[i] = audiomux[i];
                         gpiobits |= audiomux[i];
                 }
         } else {
                 gpiobits = audioall;
-                for (i = 0; i < 5; i++) {
+                for (i = 0; i < 4; i++) {
                         bttv_tvcards[btv->c.type].gpiomux[i] = audioall;
                 }
         }
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c
index 16323a5d68ac..afcfe71e3792 100644
--- a/drivers/media/video/bt8xx/bttv-risc.c
+++ b/drivers/media/video/bt8xx/bttv-risc.c
@@ -233,7 +233,7 @@ bttv_risc_overlay(struct bttv *btv, struct btcx_riscmem *risc,
                   const struct bttv_format *fmt, struct bttv_overlay *ov,
                   int skip_even, int skip_odd)
 {
-        int instructions,rc,line,maxy,start,end,skip,nskips;
+        int dwords,rc,line,maxy,start,end,skip,nskips;
         struct btcx_skiplist *skips;
         u32 *rp,ri,ra;
         u32 addr;
@@ -242,12 +242,12 @@ bttv_risc_overlay(struct bttv *btv, struct btcx_riscmem *risc,
         if (NULL == (skips = kmalloc(sizeof(*skips) * ov->nclips,GFP_KERNEL)))
                 return -ENOMEM;
 
-        /* estimate risc mem: worst case is (clip+1) * lines instructions
+        /* estimate risc mem: worst case is (1.5*clip+1) * lines instructions
            + sync + jump (all 2 dwords) */
-        instructions  = (ov->nclips + 1) *
-                ((skip_even || skip_odd) ? ov->w.height>>1 :  ov->w.height);
-        instructions += 2;
-        if ((rc = btcx_riscmem_alloc(btv->c.pci,risc,instructions*8)) < 0) {
+        dwords  = (3 * ov->nclips + 2) *
+                ((skip_even || skip_odd) ? (ov->w.height+1)>>1 :  ov->w.height);
+        dwords += 4;
+        if ((rc = btcx_riscmem_alloc(btv->c.pci,risc,dwords*4)) < 0) {
                 kfree(skips);
                 return rc;
         }
@@ -276,8 +276,6 @@ bttv_risc_overlay(struct bttv *btv, struct btcx_riscmem *risc,
                 if (line > maxy)
                         btcx_calc_skips(line, ov->w.width, &maxy,
                                         skips, &nskips, ov->clips, ov->nclips);
-                else
-                        nskips = 0;
 
                 /* write out risc code */
                 for (start = 0, skip = 0; start < ov->w.width; start = end) {
diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c
index f59ced181c55..1958d4016ea1 100644
--- a/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/drivers/media/video/cx25840/cx25840-firmware.c
@@ -39,29 +39,12 @@
 
 #define FWDEV(x) &((x)->adapter->dev)
 
-static int fastfw = 1;
 static char *firmware = FWFILE;
 
-module_param(fastfw, bool, 0444);
 module_param(firmware, charp, 0444);
 
-MODULE_PARM_DESC(fastfw, "Load firmware fast [0=100MHz 1=333MHz (default)]");
 MODULE_PARM_DESC(firmware, "Firmware image [default: " FWFILE "]");
 
-static void set_i2c_delay(struct i2c_client *client, int delay)
-{
-        struct i2c_algo_bit_data *algod = client->adapter->algo_data;
-
-        /* We aren't guaranteed to be using algo_bit,
-         * so avoid the null pointer dereference
-         * and disable the 'fast firmware load' */
-        if (algod) {
-                algod->udelay = delay;
-        } else {
-                fastfw = 0;
-        }
-}
-
 static void start_fw_load(struct i2c_client *client)
 {
         /* DL_ADDR_LB=0 DL_ADDR_HB=0 */
@@ -71,16 +54,10 @@ static void start_fw_load(struct i2c_client *client)
         cx25840_write(client, 0x803, 0x0b);
         /* AUTO_INC_DIS=1 */
         cx25840_write(client, 0x000, 0x20);
-
-        if (fastfw)
-                set_i2c_delay(client, 3);
 }
 
 static void end_fw_load(struct i2c_client *client)
 {
-        if (fastfw)
-                set_i2c_delay(client, 10);
-
         /* AUTO_INC_DIS=0 */
         cx25840_write(client, 0x000, 0x00);
         /* DL_ENABLE=0 */
@@ -107,30 +84,8 @@ static int fw_write(struct i2c_client *client, u8 * data, int size)
         int sent;
 
         if ((sent = i2c_master_send(client, data, size)) < size) {
-
-                if (fastfw) {
-                        v4l_err(client, "333MHz i2c firmware load failed\n");
-                        fastfw = 0;
-                        set_i2c_delay(client, 10);
-
-                        if (sent > 2) {
-                                u16 dl_addr = cx25840_read(client, 0x801) << 8;
-                                dl_addr |= cx25840_read(client, 0x800);
-                                dl_addr -= sent - 2;
-                                cx25840_write(client, 0x801, dl_addr >> 8);
-                                cx25840_write(client, 0x800, dl_addr & 0xff);
-                        }
-
-                        if (i2c_master_send(client, data, size) < size) {
-                                v4l_err(client, "100MHz i2c firmware load failed\n");
-                                return -ENOSYS;
-                        }
-
-                } else {
-                        v4l_err(client, "firmware load i2c failure\n");
-                        return -ENOSYS;
-                }
-
+                v4l_err(client, "firmware load i2c failure\n");
+                return -ENOSYS;
         }
 
         return 0;
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index c7042cf41231..f80154b87d22 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -564,7 +564,7 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_PCHDTV_HD3000] = {
                 .name           = "pcHDTV HD3000 HDTV",
-                .tuner_type     = TUNER_THOMSON_DTT7610,
+                .tuner_type     = TUNER_THOMSON_DTT761X,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 2c3d9f1999be..e1092d5d4628 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -146,9 +146,11 @@ int cx88_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
                 fields++;
 
         /* estimate risc mem: worst case is one write per page border +
-           one write per scan line + syncs + jump (all 2 dwords) */
-        instructions  = (bpl * lines * fields) / PAGE_SIZE + lines * fields;
-        instructions += 3 + 4;
+           one write per scan line + syncs + jump (all 2 dwords).  Padding
+           can cause next bpl to start close to a page border.  First DMA
+           region may be smaller than PAGE_SIZE */
+        instructions  = fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE + lines);
+        instructions += 2;
         if ((rc = btcx_riscmem_alloc(pci,risc,instructions*8)) < 0)
                 return rc;
 
@@ -176,9 +178,11 @@ int cx88_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
         int rc;
 
         /* estimate risc mem: worst case is one write per page border +
-           one write per scan line + syncs + jump (all 2 dwords) */
-        instructions  = (bpl * lines) / PAGE_SIZE + lines;
-        instructions += 3 + 4;
+           one write per scan line + syncs + jump (all 2 dwords).  Here
+           there is no padding and no sync.  First DMA region may be smaller
+           than PAGE_SIZE */
+        instructions  = 1 + (bpl * lines) / PAGE_SIZE + lines;
+        instructions += 1;
         if ((rc = btcx_riscmem_alloc(pci,risc,instructions*8)) < 0)
                 return rc;
 
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index f0ea9b5cdbc2..3619a449aefd 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -372,7 +372,7 @@ static int or51132_set_ts_param(struct dvb_frontend* fe,
 static struct or51132_config pchdtv_hd3000 = {
         .demod_address    = 0x15,
         .pll_address      = 0x61,
-        .pll_desc         = &dvb_pll_thomson_dtt7610,
+        .pll_desc         = &dvb_pll_thomson_dtt761x,
         .set_ts_params    = or51132_set_ts_param,
 };
 #endif
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 72a417b31745..694d1d80ff3f 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -35,8 +35,10 @@
 #include "cx88.h"
 #include <media/v4l2-common.h>
 
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 /* Include V4L1 specific functions. Should be removed soon */
 #include <linux/videodev.h>
+#endif
 
 MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index 5a793ae7cc23..dfb15bfb83dc 100644
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_EM28XX
         tristate "Empia EM2800/2820/2840 USB video capture support"
-        depends on VIDEO_DEV && USB && I2C
+        depends on VIDEO_V4L1 && USB && I2C
         select VIDEO_BUF
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index ddc92cbb5276..cf7cdf9ef617 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1576,8 +1576,8 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         errCode = em28xx_config(dev);
         if (errCode) {
                 em28xx_errdev("error configuring device\n");
-                kfree(dev);
                 em28xx_devused&=~(1<<dev->devno);
+                kfree(dev);
                 return -ENOMEM;
         }
 
@@ -1603,8 +1603,8 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         dev->vdev = video_device_alloc();
         if (NULL == dev->vdev) {
                 em28xx_errdev("cannot allocate video_device.\n");
-                kfree(dev);
                 em28xx_devused&=~(1<<dev->devno);
+                kfree(dev);
                 return -ENOMEM;
         }
 
@@ -1612,8 +1612,8 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         if (NULL == dev->vbi_dev) {
                 em28xx_errdev("cannot allocate video_device.\n");
                 kfree(dev->vdev);
-                kfree(dev);
                 em28xx_devused&=~(1<<dev->devno);
+                kfree(dev);
                 return -ENOMEM;
         }
 
@@ -1650,8 +1650,8 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
                 mutex_unlock(&dev->lock);
                 list_del(&dev->devlist);
                 video_device_release(dev->vdev);
-                kfree(dev);
                 em28xx_devused&=~(1<<dev->devno);
+                kfree(dev);
                 return -ENODEV;
         }
 
@@ -1662,8 +1662,8 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
                 list_del(&dev->devlist);
                 video_device_release(dev->vbi_dev);
                 video_device_release(dev->vdev);
-                kfree(dev);
                 em28xx_devused&=~(1<<dev->devno);
+                kfree(dev);
                 return -ENODEV;
         } else {
                 printk("registered VBI\n");
diff --git a/drivers/media/video/et61x251/Kconfig b/drivers/media/video/et61x251/Kconfig
index 6c43a90c6569..c6bff705688d 100644
--- a/drivers/media/video/et61x251/Kconfig
+++ b/drivers/media/video/et61x251/Kconfig
@@ -1,6 +1,6 @@
 config USB_ET61X251
         tristate "USB ET61X[12]51 PC Camera Controller support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want support for cameras based on Etoms ET61X151
           or ET61X251 PC Camera Controllers.
diff --git a/drivers/media/video/pwc/Kconfig b/drivers/media/video/pwc/Kconfig
index 86376556f108..53cbc950f95c 100644
--- a/drivers/media/video/pwc/Kconfig
+++ b/drivers/media/video/pwc/Kconfig
@@ -1,6 +1,6 @@
 config USB_PWC
         tristate "USB Philips Cameras"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y or M here if you want to use one of these Philips & OEM
           webcams:
diff --git a/drivers/media/video/pwc/Makefile b/drivers/media/video/pwc/Makefile
index 8326684f49f3..33d60126c024 100644
--- a/drivers/media/video/pwc/Makefile
+++ b/drivers/media/video/pwc/Makefile
@@ -1,20 +1,3 @@
-ifneq ($(KERNELRELEASE),)
-
 pwc-objs        := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o pwc-timon.o pwc-kiara.o
 
 obj-$(CONFIG_USB_PWC) += pwc.o
-
-else
-
-KDIR := /lib/modules/$(shell uname -r)/build
-PWD := $(shell pwd)
-
-default:
-        $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-
-endif
-
-clean:
-        rm -f *.[oas] .*.flags *.ko .*.cmd .*.d .*.tmp *.mod.c
-        rm -rf .tmp_versions
-
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 133f9e5252fe..c271e2e14105 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -142,6 +142,7 @@ struct i2c_reg_value {
 static const struct i2c_reg_value saa7129_init_config_extra[] = {
         { SAA7127_REG_OUTPUT_PORT_CONTROL,              0x38 },
         { SAA7127_REG_VTRIG,                            0xfa },
+        { 0, 0 }
 };
 
 static const struct i2c_reg_value saa7127_init_config_common[] = {
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index e666a4465ca4..86eae3528330 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3504,6 +3504,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
                 /* power-up tuner chip */
                 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x00040000, 0x00040000);
                 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000000);
+                break;
         case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL:
                 /* this turns the remote control chip off to work around a bug in it */
                 saa_writeb(SAA7134_GPIO_GPMODE1, 0x80);
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 13de05532e0a..f0c2111f14ad 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -548,6 +548,8 @@ static irqreturn_t saa7134_irq(int irq, void *dev_id, struct pt_regs *regs)
                 if (report & SAA7134_IRQ_REPORT_GPIO16) {
                         switch (dev->has_remote) {
                                 case SAA7134_REMOTE_GPIO:
+                                        if (!dev->remote)
+                                                break;
                                         if  (dev->remote->mask_keydown & 0x10000) {
                                                 saa7134_input_irq(dev);
                                         }
@@ -564,6 +566,8 @@ static irqreturn_t saa7134_irq(int irq, void *dev_id, struct pt_regs *regs)
                 if (report & SAA7134_IRQ_REPORT_GPIO18) {
                         switch (dev->has_remote) {
                                 case SAA7134_REMOTE_GPIO:
+                                        if (!dev->remote)
+                                                break;
                                         if ((dev->remote->mask_keydown & 0x40000) ||
                                             (dev->remote->mask_keyup & 0x40000)) {
                                                 saa7134_input_irq(dev);
@@ -676,7 +680,7 @@ static int saa7134_hwinit2(struct saa7134_dev *dev)
                 SAA7134_IRQ2_INTE_PE      |
                 SAA7134_IRQ2_INTE_AR;
 
-        if (dev->has_remote == SAA7134_REMOTE_GPIO) {
+        if (dev->has_remote == SAA7134_REMOTE_GPIO && dev->remote) {
                 if (dev->remote->mask_keydown & 0x10000)
                         irq2_mask |= SAA7134_IRQ2_INTE_GPIO16;
                 else if (dev->remote->mask_keydown & 0x40000)
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index aeef80f88a6b..e4156ec9c6d7 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -31,8 +31,10 @@
 #include "saa7134.h"
 #include <media/v4l2-common.h>
 
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 /* Include V4L1 specific functions. Should be removed soon */
 #include <linux/videodev.h>
+#endif
 
 /* ------------------------------------------------------------------ */
 
diff --git a/drivers/media/video/sn9c102/Kconfig b/drivers/media/video/sn9c102/Kconfig
index 55f2bc11964b..cf552e6b8ecf 100644
--- a/drivers/media/video/sn9c102/Kconfig
+++ b/drivers/media/video/sn9c102/Kconfig
@@ -1,6 +1,6 @@
 config USB_SN9C102
         tristate "USB SN9C10x PC Camera Controller support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want support for cameras based on SONiX SN9C101,
           SN9C102 or SN9C103 PC Camera Controllers.
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
index 72e0f01db563..a1ae036b44ec 100644
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
@@ -877,8 +877,8 @@ static struct tuner_params tuner_philips_fmd1216me_mk3_params[] = {
 /* ------------ TUNER_LG_TDVS_H062F - INFINEON ATSC ------------ */
 
 static struct tuner_range tuner_tua6034_ntsc_ranges[] = {
-        { 16 * 160.00 /*MHz*/, 0x8e, 0x01 },
-        { 16 * 455.00 /*MHz*/, 0x8e, 0x02 },
+        { 16 * 165.00 /*MHz*/, 0x8e, 0x01 },
+        { 16 * 450.00 /*MHz*/, 0x8e, 0x02 },
         { 16 * 999.99        , 0x8e, 0x04 },
 };
 
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 431c3e2f6c42..b463e996961a 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -218,7 +218,7 @@ hauppauge_tuner[] =
         /* 110-119 */
         { TUNER_ABSENT,        "Thompson DTT75105"},
         { TUNER_ABSENT,        "Conexant_CX24109"},
-        { TUNER_ABSENT,        "TCL M2523_5N_E"},
+        { TUNER_TCL_2002N,     "TCL M2523_5N_E"},
         { TUNER_ABSENT,        "TCL M2523_3DB_E"},
         { TUNER_ABSENT,        "Philips 8275A"},
         { TUNER_ABSENT,        "Microtune MT2060"},
diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig
index 08a5d20bb2c0..39269a2c5635 100644
--- a/drivers/media/video/usbvideo/Kconfig
+++ b/drivers/media/video/usbvideo/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_USBVIDEO
 
 config USB_VICAM
         tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-        depends on USB && VIDEO_DEV && EXPERIMENTAL
+        depends on USB && VIDEO_V4L1 && EXPERIMENTAL
         select VIDEO_USBVIDEO
         ---help---
           Say Y here if you have 3com homeconnect camera (vicam).
@@ -13,7 +13,7 @@ config USB_VICAM
 
 config USB_IBMCAM
         tristate "USB IBM (Xirlink) C-it Camera support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         select VIDEO_USBVIDEO
         ---help---
           Say Y here if you want to connect a IBM "C-It" camera, also known as
@@ -28,7 +28,7 @@ config USB_IBMCAM
 
 config USB_KONICAWC
         tristate "USB Konica Webcam support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         select VIDEO_USBVIDEO
         ---help---
           Say Y here if you want support for webcams based on a Konica
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 5e813404d068..779db26771c0 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -26,6 +26,11 @@
 #include <linux/random.h>
 #include <linux/version.h>
 #include <linux/videodev2.h>
+#include <linux/dma-mapping.h>
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+/* Include V4L1 specific functions. Should be removed soon */
+#include <linux/videodev.h>
+#endif
 #include <linux/interrupt.h>
 #include <media/video-buf.h>
 #include <media/v4l2-common.h>
diff --git a/drivers/media/video/zc0301/Kconfig b/drivers/media/video/zc0301/Kconfig
index c3bf886b80cd..115833e4f4dd 100644
--- a/drivers/media/video/zc0301/Kconfig
+++ b/drivers/media/video/zc0301/Kconfig
@@ -1,6 +1,6 @@
 config USB_ZC0301
         tristate "USB ZC0301 Image Processor and Control Chip support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want support for cameras based on the ZC0301
           Image Processor and Control Chip.