diff options
| author | Dave Jones <davej@redhat.com> | 2006-04-19 00:19:55 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-04-19 00:19:55 +0200 |
| commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
| tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /drivers/media/video/msp3400-driver.h | |
| parent | [CPUFREQ] x86_64: Proper null pointer check in powernow_k8_get (diff) | |
| parent | x86: be careful about tailcall breakage for sys_open[at] too (diff) | |
| download | linux-f1f76afd71e0f17af9a35fcb649f4bab53304a4d.tar.xz linux-f1f76afd71e0f17af9a35fcb649f4bab53304a4d.zip | |
Merge ../linus
Diffstat (limited to 'drivers/media/video/msp3400-driver.h')
| -rw-r--r-- | drivers/media/video/msp3400-driver.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h index 1940748bb633..4e451049013d 100644 --- a/drivers/media/video/msp3400-driver.h +++ b/drivers/media/video/msp3400-driver.h @@ -54,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; @@ -83,6 +85,7 @@ struct msp_state { int volume, muted; int balance, loudness; int bass, treble; + int scan_in_progress; /* thread */ struct task_struct *kthread; @@ -98,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); |