diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /include/media/saa7146_vv.h | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/media/saa7146_vv.h')
| -rw-r--r-- | include/media/saa7146_vv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index f3aa24f8131c..64691753721e 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef __SAA7146_VV__ | 1 | #ifndef __SAA7146_VV__ |
| 2 | #define __SAA7146_VV__ | 2 | #define __SAA7146_VV__ |
| 3 | 3 | ||
| 4 | #include <linux/videodev2.h> | 4 | #include <linux/videodev.h> |
| 5 | 5 | ||
| 6 | #include <media/saa7146.h> | 6 | #include <media/saa7146.h> |
| 7 | #include <media/video-buf.h> | 7 | #include <media/video-buf.h> |