diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /drivers/media/video/cpia2/cpia2.h | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'drivers/media/video/cpia2/cpia2.h')
| -rw-r--r-- | drivers/media/video/cpia2/cpia2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h index 916c13d5cf7d..6d6d1843791c 100644 --- a/drivers/media/video/cpia2/cpia2.h +++ b/drivers/media/video/cpia2/cpia2.h | |||
| @@ -378,7 +378,7 @@ struct cpia2_fh { | |||
| 378 | 378 | ||
| 379 | struct camera_data { | 379 | struct camera_data { |
| 380 | /* locks */ | 380 | /* locks */ |
| 381 | struct mutex busy_lock; /* guard against SMP multithreading */ | 381 | struct mutex v4l2_lock; /* serialize file operations */ |
| 382 | struct v4l2_prio_state prio; | 382 | struct v4l2_prio_state prio; |
| 383 | 383 | ||
| 384 | /* camera status */ | 384 | /* camera status */ |