diff options
| author | Michael Hunold <devnull@localhost> | 2003-05-28 08:23:36 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-05-28 08:23:36 +0000 |
| commit | be344081c3398400b5f498319c023b2adfeb7054 (patch) | |
| tree | ad998f3fa6b8d9506deb70a37244cfd0bf00948c /linux/drivers | |
| parent | 57acd5e21e7e9c8f1ec52623c7999b7d4e4c1d35 (diff) | |
| download | mediapointer-dvb-s2-be344081c3398400b5f498319c023b2adfeb7054.tar.gz mediapointer-dvb-s2-be344081c3398400b5f498319c023b2adfeb7054.tar.bz2 | |
Some include fixes to make the code compile again both with
"build-2.4" and 2.5.70
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_functions.h | 4 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.h | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_functions.h b/linux/drivers/media/dvb/dvb-core/dvb_functions.h index 6e67b684c..9bb8053d2 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_functions.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_functions.h @@ -1,6 +1,8 @@ #ifndef __DVB_FUNCTIONS_H__ #define __DVB_FUNCTIONS_H__ +#include <linux/version.h> + /** * a sleeping delay function, waits i ms * @@ -23,7 +25,9 @@ extern int dvb_usercopy(struct inode *inode, struct file *file, extern void dvb_kernel_thread_setup (const char *thread_name); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) #include "dvb_compat.h" +#endif #endif diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 1963ac731..7b77d4862 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -30,7 +30,6 @@ #include <linux/sched.h> #include <linux/init.h> #include <linux/slab.h> -#include <linux/version.h> #include "dvbdev.h" #include "dvb_functions.h" diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.h b/linux/drivers/media/dvb/dvb-core/dvbdev.h index 80091914e..967bdadf1 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.h +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.h @@ -28,9 +28,8 @@ #include <linux/poll.h> #include <linux/fs.h> #include <linux/list.h> -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - #include <linux/devfs_fs_kernel.h> -#endif +#include <linux/version.h> +#include <linux/devfs_fs_kernel.h> #define DVB_MAJOR 250 |