diff options
| author | Michael Hunold <devnull@localhost> | 2003-03-20 09:56:57 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-03-20 09:56:57 +0000 |
| commit | dab9ea33014f096f57a109767f77a48c544bcbb4 (patch) | |
| tree | e91686163e24c2de98c5f084487436e33ee408f7 /linux/include | |
| parent | 5797f42d3ed47493db6ec2b904a9e8df10969f90 (diff) | |
| download | mediapointer-dvb-s2-dab9ea33014f096f57a109767f77a48c544bcbb4.tar.gz mediapointer-dvb-s2-dab9ea33014f096f57a109767f77a48c544bcbb4.tar.bz2 | |
Small changes all over the place:
- sync Kconfig and Makefiles with 2.5.65
- fix various things in saa7146 because of latest v4l changes in 2.5.65
- makelinks: removed the compat module from the 2.5.x build process
- makelinks: removed the linkage of ttusb and bt8xx -- enable this again for
the next patches, when ttusb is more stable and the bt8xx related patches
have been applied by Gerd Knorr
- dvb: removed the compat module from the 2.5.x build process, added #ifdefs
around the inclusion of compat.h. this was necessary because having compat
code in the newest 2.5.x kernel is awkward.
- dvb: move around of dvb_usercopy again. because I removed the compat module
from the 2.5.x build process, dvb_usercopy had to be moved to another file
- dvb: change MOD_*_USE_COUNT to module_get/module_put in various files,
but I'm not sure if I did this right. please review these changes.
- dvb: removed the crc32 code from dvb_demux.c, because it's in compat.c, too.
- dvb: removed some cruft from dvd_i2c.c, which is present in compat.h
- all files: apply small fixes to reflect the new location of some header
files
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/saa7146.h | 4 | ||||
| -rw-r--r-- | linux/include/media/saa7146_vv.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index dcb4510c5..ac8544da4 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -14,7 +14,9 @@ #include <asm/io.h> /* for accessing devices */ #include <linux/stringify.h> -#include "compat.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) + #include "compat.h" +#endif #define SAA7146_VERSION_CODE KERNEL_VERSION(0,5,0) diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h index a22ebe560..f45c32a4c 100644 --- a/linux/include/media/saa7146_vv.h +++ b/linux/include/media/saa7146_vv.h @@ -1,10 +1,10 @@ #ifndef __SAA7146_VV__ #define __SAA7146_VV__ -#include "saa7146.h" - #include <linux/videodev2.h> -#include "video-buf.h" + +#include <media/saa7146.h> +#include <media/video-buf.h> #define MAX_SAA7146_CAPTURE_BUFFERS 32 /* arbitrary */ #define BUFFER_TIMEOUT (HZ/2) /* 0.5 seconds */ |