diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/media/video/cx25840/cx25840.h | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/media/video/cx25840/cx25840.h')
| -rw-r--r-- | drivers/media/video/cx25840/cx25840.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx25840/cx25840.h b/drivers/media/video/cx25840/cx25840.h index fd22f30dcc1b..dd70664d1dd9 100644 --- a/drivers/media/video/cx25840/cx25840.h +++ b/drivers/media/video/cx25840/cx25840.h | |||
| @@ -78,6 +78,7 @@ struct cx25840_state { | |||
| 78 | enum cx25840_video_input vid_input; | 78 | enum cx25840_video_input vid_input; |
| 79 | enum cx25840_audio_input aud_input; | 79 | enum cx25840_audio_input aud_input; |
| 80 | u32 audclk_freq; | 80 | u32 audclk_freq; |
| 81 | int audmode; | ||
| 81 | }; | 82 | }; |
| 82 | 83 | ||
| 83 | /* ----------------------------------------------------------------------- */ | 84 | /* ----------------------------------------------------------------------- */ |