git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
media
/
video
/
msp3400-driver.h
diff --git
a/drivers/media/video/msp3400-driver.h
b/drivers/media/video/msp3400-driver.h
index
4e45104
..
7531efa
100644
(file)
--- a/
drivers/media/video/msp3400-driver.h
+++ b/
drivers/media/video/msp3400-driver.h
@@
-64,6
+64,7
@@
struct msp_state {
u8 has_sound_processing;
u8 has_virtual_dolby_surround;
u8 has_dolby_pro_logic;
u8 has_sound_processing;
u8 has_virtual_dolby_surround;
u8 has_dolby_pro_logic;
+ u8 force_btsc;
int radio;
int opmode;
int radio;
int opmode;
@@
-90,8
+91,8
@@
struct msp_state {
/* thread */
struct task_struct *kthread;
wait_queue_head_t wq;
/* thread */
struct task_struct *kthread;
wait_queue_head_t wq;
-
int
restart:1;
-
int
watch_stereo:1;
+
unsigned int
restart:1;
+
unsigned int
watch_stereo:1;
};
/* msp3400-driver.c */
};
/* msp3400-driver.c */