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/saa717x.c | |
| parent | d89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/media/video/saa717x.c')
| -rw-r--r-- | drivers/media/video/saa717x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c index 2220f9569941..af60ede5310d 100644 --- a/drivers/media/video/saa717x.c +++ b/drivers/media/video/saa717x.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 36 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
| 37 | 37 | ||
| 38 | #include <linux/videodev.h> | ||
| 39 | #include <linux/videodev2.h> | 38 | #include <linux/videodev2.h> |
| 40 | #include <linux/i2c.h> | 39 | #include <linux/i2c.h> |
| 41 | #include <media/v4l2-common.h> | 40 | #include <media/v4l2-common.h> |