diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:44:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:44:17 -0500 |
| commit | f333b3f111e9db76109e304df8ee777ace7fbf86 (patch) | |
| tree | ce9a74a7327020c48c80d278e1db5f12552f0fb0 /drivers/media/video/saa711x.c | |
| parent | f4256e301d9800b1e0276404cb01b3ac85b51067 (diff) | |
| parent | 79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/media/video/saa711x.c')
| -rw-r--r-- | drivers/media/video/saa711x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c index 9aa8827de2c3..25b30f352d84 100644 --- a/drivers/media/video/saa711x.c +++ b/drivers/media/video/saa711x.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
| 37 | #include <asm/page.h> | 37 | #include <asm/page.h> |
| 38 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
| 39 | #include <asm/segment.h> | ||
| 40 | #include <linux/types.h> | 39 | #include <linux/types.h> |
| 41 | #include <asm/uaccess.h> | 40 | #include <asm/uaccess.h> |
| 42 | #include <linux/videodev.h> | 41 | #include <linux/videodev.h> |