diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/media/video/msp3400-driver.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/media/video/msp3400-driver.c')
| -rw-r--r-- | drivers/media/video/msp3400-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c index 5691e019d195..3da74dcee902 100644 --- a/drivers/media/video/msp3400-driver.c +++ b/drivers/media/video/msp3400-driver.c | |||
| @@ -51,9 +51,9 @@ | |||
| 51 | #include <linux/module.h> | 51 | #include <linux/module.h> |
| 52 | #include <linux/slab.h> | 52 | #include <linux/slab.h> |
| 53 | #include <linux/i2c.h> | 53 | #include <linux/i2c.h> |
| 54 | #include <linux/videodev.h> | ||
| 55 | #include <linux/videodev2.h> | 54 | #include <linux/videodev2.h> |
| 56 | #include <media/v4l2-common.h> | 55 | #include <media/v4l2-common.h> |
| 56 | #include <media/v4l2-ioctl.h> | ||
| 57 | #include <media/v4l2-i2c-drv-legacy.h> | 57 | #include <media/v4l2-i2c-drv-legacy.h> |
| 58 | #include <media/tvaudio.h> | 58 | #include <media/tvaudio.h> |
| 59 | #include <media/msp3400.h> | 59 | #include <media/msp3400.h> |