Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / drivers / media / video / tcm825x.h

diff --git a/drivers/media/video/tcm825x.h b/drivers/media/video/tcm825x.h
index d6471ec40bc51f010d89f1551de92c89b7097c9a..770ebacfa344a109663d533f9dc049a226409bd1 100644 (file)
--- a/drivers/media/video/tcm825x.h
+++ b/drivers/media/video/tcm825x.h
@@ -163,6 +163,9 @@ enum pixel_format { YUV422 = 0, RGB565 };
 #define NUM_IMAGE_SIZES 6
 #define NUM_PIXEL_FORMATS 2
 
+#define TCM825X_XCLK_MIN       11900000
+#define TCM825X_XCLK_MAX       25000000
+
 struct capture_size {
        unsigned long width;
        unsigned long height;
@@ -178,6 +181,8 @@ struct tcm825x_platform_data {
        const struct tcm825x_reg *(*default_regs)(void);
        int (*needs_reset)(struct v4l2_int_device *s, void *buf,
                           struct v4l2_pix_format *fmt);
+       int (*ifparm)(struct v4l2_ifparm *p);
+       int (*is_upside_down)(void);
 };
 
 /* Array of image sizes supported by TCM825X.  These must be ordered from