V4L/DVB: gspca_sonixb: Add support for camera button

[safe/jmp/linux-2.6] / drivers / media / video / ov511.h

diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h
index 18c6422..c450c92 100644 (file)
--- a/drivers/media/video/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -4,6 +4,7 @@
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
 
@@ -11,8 +12,9 @@
 
 #ifdef OV511_DEBUG
        #define PDEBUG(level, fmt, args...) \
-               if (debug >= (level)) info("[%s:%d] " fmt, \
-               __FUNCTION__, __LINE__ , ## args)
+               if (debug >= (level))   \
+                       printk(KERN_INFO KBUILD_MODNAME "[%s:%d] \n" fmt, \
+               __func__, __LINE__ , ## args)
 #else
        #define PDEBUG(level, fmt, args...) do {} while(0)
 #endif
@@ -492,6 +494,9 @@ struct usb_ov511 {
        int has_decoder;        /* Device has a video decoder */
        int pal;                /* Device is designed for PAL resolution */
 
+       /* ov511 device number ID */
+       int nr;                 /* Stores a device number */
+
        /* I2C interface */
        struct mutex i2c_lock;    /* Protect I2C controller regs */
        unsigned char primary_i2c_slave;  /* I2C write id of sensor */