diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
| commit | b05005772f34497eb2b7415a651fe785cbe70e16 (patch) | |
| tree | b176aeb7fa9baf69e77ddd83e844727490bfcf28 /include/linux/videodev2.h | |
| parent | 044f324f6ea5d55391db62fca6a295b2651cb946 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
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 3f1504353472..724cfbf54b8a 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -560,7 +560,7 @@ struct v4l2_framebuffer | |||
| 560 | struct v4l2_clip | 560 | struct v4l2_clip |
| 561 | { | 561 | { |
| 562 | struct v4l2_rect c; | 562 | struct v4l2_rect c; |
| 563 | struct v4l2_clip *next; | 563 | struct v4l2_clip __user *next; |
| 564 | }; | 564 | }; |
| 565 | 565 | ||
| 566 | struct v4l2_window | 566 | struct v4l2_window |