diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /include/linux/videodev2.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'include/linux/videodev2.h')
| -rw-r--r-- | include/linux/videodev2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index b59e78c57161..dfd4745a955f 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -490,7 +490,7 @@ struct v4l2_jpegcompression { | |||
| 490 | * you do, leave them untouched. | 490 | * you do, leave them untouched. |
| 491 | * Inluding less markers will make the | 491 | * Inluding less markers will make the |
| 492 | * resulting code smaller, but there will | 492 | * resulting code smaller, but there will |
| 493 | * be fewer aplications which can read it. | 493 | * be fewer applications which can read it. |
| 494 | * The presence of the APP and COM marker | 494 | * The presence of the APP and COM marker |
| 495 | * is influenced by APP_len and COM_len | 495 | * is influenced by APP_len and COM_len |
| 496 | * ONLY, not by this property! */ | 496 | * ONLY, not by this property! */ |