diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-19 03:44:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-19 03:44:37 -0500 |
| commit | 3ac3ba0b396fd99550e08034b0e4c27fdf39c252 (patch) | |
| tree | f9f69fac41d66540a37a33808714d055d702328f /drivers/media/video/cx88/cx88.h | |
| parent | 934352f214b3251eb0793c1209d346595a661d80 (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'linus' into sched/core
Conflicts:
kernel/Makefile
Diffstat (limited to 'drivers/media/video/cx88/cx88.h')
| -rw-r--r-- | drivers/media/video/cx88/cx88.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 76207c2856b7..f4240965be32 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
| @@ -352,6 +352,7 @@ struct cx88_core { | |||
| 352 | /* various v4l controls */ | 352 | /* various v4l controls */ |
| 353 | u32 freq; | 353 | u32 freq; |
| 354 | atomic_t users; | 354 | atomic_t users; |
| 355 | atomic_t mpeg_users; | ||
| 355 | 356 | ||
| 356 | /* cx88-video needs to access cx8802 for hybrid tuner pll access. */ | 357 | /* cx88-video needs to access cx8802 for hybrid tuner pll access. */ |
| 357 | struct cx8802_dev *dvbdev; | 358 | struct cx8802_dev *dvbdev; |