diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index dd18ceb30a43..af15fd3f4f81 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
| @@ -301,7 +301,6 @@ struct em28xx { | |||
| 301 | int hscale; /* horizontal scale factor (see datasheet) */ | 301 | int hscale; /* horizontal scale factor (see datasheet) */ |
| 302 | int vscale; /* vertical scale factor (see datasheet) */ | 302 | int vscale; /* vertical scale factor (see datasheet) */ |
| 303 | int interlaced; /* 1=interlace fileds, 0=just top fileds */ | 303 | int interlaced; /* 1=interlace fileds, 0=just top fileds */ |
| 304 | int type; | ||
| 305 | unsigned int video_bytesread; /* Number of bytes read */ | 304 | unsigned int video_bytesread; /* Number of bytes read */ |
| 306 | 305 | ||
| 307 | unsigned long hash; /* eeprom hash - for boards with generic ID */ | 306 | unsigned long hash; /* eeprom hash - for boards with generic ID */ |
| @@ -317,7 +316,7 @@ struct em28xx { | |||
| 317 | 316 | ||
| 318 | /* locks */ | 317 | /* locks */ |
| 319 | struct mutex lock; | 318 | struct mutex lock; |
| 320 | spinlock_t queue_lock; | 319 | /* spinlock_t queue_lock; */ |
| 321 | struct list_head inqueue, outqueue; | 320 | struct list_head inqueue, outqueue; |
| 322 | wait_queue_head_t open, wait_frame, wait_stream; | 321 | wait_queue_head_t open, wait_frame, wait_stream; |
| 323 | struct video_device *vbi_dev; | 322 | struct video_device *vbi_dev; |