Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cb77d010221e66c63f4a71546fed73be9b12b9a3
Commit:     cb77d010221e66c63f4a71546fed73be9b12b9a3
Parent:     195a4ef627e110cd468a69fdb973548e6914577a
Author:     Mauro Carvalho Chehab <[EMAIL PROTECTED]>
AuthorDate: Sun Nov 11 13:23:54 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:02:07 2008 -0200

    V4L/DVB (6586): Remove some dead code and make drive fully V4L2 compatible
    
    There were some vestiges of an old V4L1 I2C driver that were called by 
em28xx.
    This patch removes this dead code, and replaces videodev.h to videodev2.h
    
    Now, this driver doesn't require V4L1 anymore.
    
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/em28xx/Kconfig        |    2 +-
 drivers/media/video/em28xx/em28xx-video.c |   10 ----------
 drivers/media/video/em28xx/em28xx.h       |    3 +--
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/media/video/em28xx/Kconfig 
b/drivers/media/video/em28xx/Kconfig
index c112780..813077b 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_V4L1 && I2C && INPUT
+       depends on VIDEO_DEV && I2C && INPUT
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
        select VIDEO_IR
diff --git a/drivers/media/video/em28xx/em28xx-video.c 
b/drivers/media/video/em28xx/em28xx-video.c
index 022afb7..c4db1ae 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1675,16 +1675,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, 
struct usb_device *udev,
        dev->em28xx_read_reg_req = em28xx_read_reg_req;
        dev->is_em2800 = em28xx_boards[dev->model].is_em2800;
 
-       /* setup video picture settings for saa7113h */
-       memset(&dev->vpic, 0, sizeof(dev->vpic));
-       dev->vpic.colour = 128 << 8;
-       dev->vpic.hue = 128 << 8;
-       dev->vpic.brightness = 128 << 8;
-       dev->vpic.contrast = 192 << 8;
-       dev->vpic.whiteness = 128 << 8; /* This one isn't used */
-       dev->vpic.depth = 16;
-       dev->vpic.palette = VIDEO_PALETTE_YUV422;
-
        em28xx_pre_card_setup(dev);
 
        errCode = em28xx_config(dev);
diff --git a/drivers/media/video/em28xx/em28xx.h 
b/drivers/media/video/em28xx/em28xx.h
index 6728803..f355075 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -25,7 +25,7 @@
 #ifndef _EM28XX_H
 #define _EM28XX_H
 
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
 #include <media/ir-kbd-i2c.h>
@@ -239,7 +239,6 @@ struct em28xx {
        /* video for linux */
        int users;              /* user count for exclusive use */
        struct video_device *vdev;      /* video for linux device struct */
-       struct video_picture vpic;      /* picture settings only used to init 
saa7113h */
        struct em28xx_tvnorm *tvnorm;   /* selected tv norm */
        int ctl_freq;           /* selected frequency */
        unsigned int ctl_input; /* selected input */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to