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

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

diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h
index 545e4ac094f2e2dd513a275a8a730db4fdbe83bb..3fe1c1b10f538ce61ebb47fd6a79c20cad5baa26 100644 (file)
--- a/drivers/media/video/msp3400-driver.h
+++ b/drivers/media/video/msp3400-driver.h
@@ -5,6 +5,7 @@
 #define MSP3400_DRIVER_H
 
 #include <media/msp3400.h>
+#include <media/v4l2-device.h>
 
 /* ---------------------------------------------------------------------- */
 
@@ -49,7 +50,9 @@ extern int msp_dolby;
 extern int msp_stereo_thresh;
 
 struct msp_state {
+       struct v4l2_subdev sd;
        int rev1, rev2;
+       int ident;
        u8 has_nicam;
        u8 has_radio;
        u8 has_headphones;
@@ -64,6 +67,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;
@@ -94,6 +98,11 @@ struct msp_state {
        unsigned int         watch_stereo:1;
 };
 
+static inline struct msp_state *to_state(struct v4l2_subdev *sd)
+{
+       return container_of(sd, struct msp_state, sd);
+}
+
 /* msp3400-driver.c */
 int msp_write_dem(struct i2c_client *client, int addr, int val);
 int msp_write_dsp(struct i2c_client *client, int addr, int val);