diff options
| author | Michael Krufky <devnull@localhost> | 2005-08-28 18:22:34 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-08-28 18:22:34 +0000 |
| commit | 00e9f42e60719e2c015d16ca76f20e88cb5e1850 (patch) | |
| tree | adec8c1ab220f283c4b0908d21cea65910723d05 /linux/drivers | |
| parent | 78e372c542731965d0e10b53d49a8fe664d1274b (diff) | |
| download | mediapointer-dvb-s2-00e9f42e60719e2c015d16ca76f20e88cb5e1850.tar.gz mediapointer-dvb-s2-00e9f42e60719e2c015d16ca76f20e88cb5e1850.tar.bz2 | |
* scripts/merge-trees.sh, scripts/unmerge-trees.sh:
- include files into tree-merge necessary for the
dvb-bt8xx and dst dvb modules, based on bt8xx chips.
This also includes all dvb frontends used by bt8xx boards.
* bttv.h, videodev.h:
- #include "compat.h", needed for tree-merge.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/bttv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bttv.h b/linux/drivers/media/video/bttv.h index 981c02981..c26d1dfd9 100644 --- a/linux/drivers/media/video/bttv.h +++ b/linux/drivers/media/video/bttv.h @@ -1,5 +1,5 @@ /* - * $Id: bttv.h,v 1.22 2005/07/28 18:41:21 mchehab Exp $ + * $Id: bttv.h,v 1.23 2005/08/28 18:22:34 mkrufky Exp $ * * bttv - Bt848 frame grabber driver * @@ -17,6 +17,7 @@ #include <linux/videodev.h> #include <linux/i2c.h> +#include "compat.h" /* ---------------------------------------------------------- */ /* exported by bttv-cards.c */ |