diff options
| author | James Morris <jmorris@namei.org> | 2011-11-16 02:39:48 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-11-16 02:39:48 +0100 |
| commit | 24942c8e5cc8696064ee207ff29d4cf21f70dafc (patch) | |
| tree | 08a8221eb72ec3da7746d7d76f6f5915ce77cde7 /drivers/media/video/msp3400-driver.h | |
| parent | Documentation: clarify the purpose of LSMs (diff) | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| download | linux-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.xz linux-24942c8e5cc8696064ee207ff29d4cf21f70dafc.zip | |
Merge branch 'master'; commit 'v3.2-rc2' into next
Diffstat (limited to 'drivers/media/video/msp3400-driver.h')
| -rw-r--r-- | drivers/media/video/msp3400-driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h index 32a478e532f3..831e8db4368c 100644 --- a/drivers/media/video/msp3400-driver.h +++ b/drivers/media/video/msp3400-driver.h @@ -75,7 +75,7 @@ struct msp_state { int opmode; int std; int mode; - v4l2_std_id v4l2_std; + v4l2_std_id v4l2_std, detected_std; int nicam_on; int acb; int in_scart; |