diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 19:33:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 19:33:48 +0200 |
| commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
| tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /drivers/media/video/m52790.c | |
| parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| download | kernel-crypto-15dd859cacf312f606f54502d1f66537a1e5c78c.tar.gz kernel-crypto-15dd859cacf312f606f54502d1f66537a1e5c78c.tar.xz kernel-crypto-15dd859cacf312f606f54502d1f66537a1e5c78c.zip | |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/m52790.c')
| -rw-r--r-- | drivers/media/video/m52790.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c index 39bf6b114d5..89a781c6929 100644 --- a/drivers/media/video/m52790.c +++ b/drivers/media/video/m52790.c @@ -26,7 +26,7 @@ #include <asm/uaccess.h> #include <linux/i2c.h> #include <linux/i2c-id.h> -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/m52790.h> #include <media/v4l2-common.h> #include <media/v4l2-chip-ident.h> |