Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx25840 / cx25840-core.h

diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h
index 9ad0eb86ecfd4b94c7866bc696ea05f644234b2c..814b565369949e86a36776f3c2fe0755c75d5399 100644 (file)
--- a/drivers/media/video/cx25840/cx25840-core.h
+++ b/drivers/media/video/cx25840/cx25840-core.h
@@ -50,6 +50,7 @@ struct cx25840_state {
        u32 rev;
        int is_cx25836;
        int is_cx23885;
+       int is_cx231xx;
        int is_initialized;
        wait_queue_head_t fw_wait;    /* wake up when the fw load is finished */
        struct work_struct fw_work;   /* work entry for fw load */