diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 19:36:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 19:36:32 -0800 |
commit | 593195f9b2309693f27b402f34573f7920b82c3e (patch) | |
tree | 54d55557665e72e90ef35a1e0f008d381c17ed98 /drivers/media/video/msp3400.h | |
parent | 983d5dbdb2b38d024935f560a91cddcf704875f3 (diff) | |
parent | f9cfc08d640e1586e76eee63cc2b0a9360bc7c7e (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/msp3400.h')
-rw-r--r-- | drivers/media/video/msp3400.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/msp3400.h b/drivers/media/video/msp3400.h index 8a05cf500a8..70a5ef8ba01 100644 --- a/drivers/media/video/msp3400.h +++ b/drivers/media/video/msp3400.h @@ -48,12 +48,12 @@ struct msp_matrix { #define OPMODE_AUTOSELECT 2 /* use autodetect & autoselect (>= msp34xxG) */ /* module parameters */ -extern int debug; -extern int once; -extern int amsound; -extern int standard; -extern int dolby; -extern int stereo_threshold; +extern int msp_debug; +extern int msp_once; +extern int msp_amsound; +extern int msp_standard; +extern int msp_dolby; +extern int msp_stereo_thresh; struct msp_state { int rev1, rev2; |