[PATCH] I2C: i2c-piix4: Document the IBM problem more clearly

[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 04821ebfe04a1aa80a4416c1202b74677b10968a..4e451049013de8d87a0f20a8eb27ec8456dfe8bf 100644 (file)
--- a/drivers/media/video/msp3400-driver.h
+++ b/drivers/media/video/msp3400-driver.h
@@ -4,6 +4,8 @@
 #ifndef MSP3400_DRIVER_H
 #define MSP3400_DRIVER_H
 
+#include <media/msp3400.h>
+
 /* ---------------------------------------------------------------------- */
 
 /* This macro is allowed for *constants* only, gcc must calculate it
@@ -52,8 +54,10 @@ struct msp_state {
        u8 has_radio;
        u8 has_headphones;
        u8 has_ntsc_jp_d_k3;
+       u8 has_scart2;
+       u8 has_scart3;
        u8 has_scart4;
-       u8 has_scart23_in_scart2_out;
+       u8 has_scart2_out;
        u8 has_scart2_out_volume;
        u8 has_i2s_conf;
        u8 has_subwoofer;
@@ -72,7 +76,7 @@ struct msp_state {
        int i2s_mode;
        int main, second;       /* sound carrier */
        int input;
-       int source;             /* see msp34xxg_set_source */
+       struct v4l2_routing routing;
 
        /* v4l2 */
        int audmode;
@@ -81,6 +85,7 @@ struct msp_state {
        int volume, muted;
        int balance, loudness;
        int bass, treble;
+       int scan_in_progress;
 
        /* thread */
        struct task_struct   *kthread;
@@ -96,7 +101,6 @@ int msp_read_dem(struct i2c_client *client, int addr);
 int msp_read_dsp(struct i2c_client *client, int addr);
 int msp_reset(struct i2c_client *client);
 void msp_set_scart(struct i2c_client *client, int in, int out);
-void msp_set_mute(struct i2c_client *client);
 void msp_set_audio(struct i2c_client *client);
 int msp_sleep(struct msp_state *state, int timeout);