diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
| commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
| tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /drivers/media/video/vp27smpx.c | |
| parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'drivers/media/video/vp27smpx.c')
| -rw-r--r-- | drivers/media/video/vp27smpx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c index cbecb3cbbbaa..577956c5410b 100644 --- a/drivers/media/video/vp27smpx.c +++ b/drivers/media/video/vp27smpx.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
| 28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 29 | #include <linux/i2c-id.h> | 29 | #include <linux/i2c-id.h> |
| 30 | #include <linux/videodev.h> | 30 | #include <linux/videodev2.h> |
| 31 | #include <media/v4l2-common.h> | 31 | #include <media/v4l2-common.h> |
| 32 | #include <media/v4l2-chip-ident.h> | 32 | #include <media/v4l2-chip-ident.h> |
| 33 | #include <media/v4l2-i2c-drv.h> | 33 | #include <media/v4l2-i2c-drv.h> |