diff options
| -rw-r--r-- | linux/drivers/media/video/bttv.h | 4 | ||||
| -rw-r--r-- | linux/include/linux/videodev.h | 1 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
3 files changed, 12 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bttv.h b/linux/drivers/media/video/bttv.h index ff0a49653..307442a71 100644 --- a/linux/drivers/media/video/bttv.h +++ b/linux/drivers/media/video/bttv.h @@ -1,5 +1,5 @@ /* - * $Id: bttv.h,v 1.29 2005/10/04 17:24:34 mkrufky Exp $ + * $Id: bttv.h,v 1.30 2005/10/09 03:06:09 mkrufky Exp $ * * bttv - Bt848 frame grabber driver * @@ -15,9 +15,9 @@ #ifndef _BTTV_H_ #define _BTTV_H_ +#include "compat.h" #include <linux/videodev.h> #include <linux/i2c.h> -#include "compat.h" /* ---------------------------------------------------------- */ /* exported by bttv-cards.c */ diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h index fbd964295..d2d8928ec 100644 --- a/linux/include/linux/videodev.h +++ b/linux/include/linux/videodev.h @@ -3,7 +3,6 @@ #include <linux/compiler.h> #include <linux/types.h> -#include "compat.h" #define HAVE_V4L2 1 #include <linux/videodev2.h> diff --git a/v4l/ChangeLog b/v4l/ChangeLog index aea87d8f6..2ec96a743 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-10-08 03:04 mkrufky + + * ../linux/drivers/media/video/bttv.h: + - "compat.h" must be #include'd before <linux/videodev.h> + + * ../linux/include/linux/videodev.h: + - removed #include "compat.h" + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-09 02:06 mkrufky * ../v4l/Make.config: |