diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
| commit | 5fbf24659b75356e2142e1f1b88f67b34cbc3e75 (patch) | |
| tree | 0e470e4cc89b72e3d74939f8c39396a6a0bebb3a /drivers/media/video/cpia.h | |
| parent | d89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/media/video/cpia.h')
| -rw-r--r-- | drivers/media/video/cpia.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h index 5096058bf579..8f0cfee4b8a1 100644 --- a/drivers/media/video/cpia.h +++ b/drivers/media/video/cpia.h | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <asm/uaccess.h> | 46 | #include <asm/uaccess.h> |
| 47 | #include <linux/videodev.h> | 47 | #include <linux/videodev.h> |
| 48 | #include <media/v4l2-common.h> | 48 | #include <media/v4l2-common.h> |
| 49 | #include <media/v4l2-ioctl.h> | ||
| 49 | #include <linux/list.h> | 50 | #include <linux/list.h> |
| 50 | #include <linux/mutex.h> | 51 | #include <linux/mutex.h> |
| 51 | 52 | ||