Merge ../linux-2.6

[linux-2.6] / drivers / media / video / msp3400-driver.h

diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h
index 4e451049013de8d87a0f20a8eb27ec8456dfe8bf..ab69a290e5dc7ecde1a71ab79cb33a171d776d93 100644 (file)
--- a/drivers/media/video/msp3400-driver.h
+++ b/drivers/media/video/msp3400-driver.h
@@ -50,6 +50,7 @@ extern int msp_stereo_thresh;
 
 struct msp_state {
        int rev1, rev2;
+       int ident;
        u8 has_nicam;
        u8 has_radio;
        u8 has_headphones;
@@ -64,6 +65,7 @@ struct msp_state {
        u8 has_sound_processing;
        u8 has_virtual_dolby_surround;
        u8 has_dolby_pro_logic;
+       u8 force_btsc;
 
        int radio;
        int opmode;
@@ -90,8 +92,8 @@ struct msp_state {
        /* thread */
        struct task_struct   *kthread;
        wait_queue_head_t    wq;
-       int                  restart:1;
-       int                  watch_stereo:1;
+       unsigned int         restart:1;
+       unsigned int         watch_stereo:1;
 };
 
 /* msp3400-driver.c */