diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /drivers/media/video/ov511.h | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/ov511.h')
| -rw-r--r-- | drivers/media/video/ov511.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h index 1010e51189b7..baded1262ca9 100644 --- a/drivers/media/video/ov511.h +++ b/drivers/media/video/ov511.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <asm/uaccess.h> | 4 | #include <asm/uaccess.h> |
| 5 | #include <linux/videodev.h> | 5 | #include <linux/videodev.h> |
| 6 | #include <media/v4l2-common.h> | 6 | #include <media/v4l2-common.h> |
| 7 | #include <media/v4l2-ioctl.h> | ||
| 7 | #include <linux/usb.h> | 8 | #include <linux/usb.h> |
| 8 | #include <linux/mutex.h> | 9 | #include <linux/mutex.h> |
| 9 | 10 | ||