From 15ed91f523f46778cefab0f5e61543b41b01dd87 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 21 Nov 2002 08:21:55 +0000 Subject: [PATCH] Fixes for 2.0.39 --- include/linux/comedidev.h | 2 ++ include/linux/init.h | 4 ++++ include/linux/vmalloc.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/comedidev.h b/include/linux/comedidev.h index a4fe7668..c664e358 100644 --- a/include/linux/comedidev.h +++ b/include/linux/comedidev.h @@ -347,6 +347,7 @@ static inline unsigned int bytes_per_sample( const comedi_subdevice *subd ) return sizeof( sampl_t ); } +#if LINUX_VERSION_CODE >= 0x020200 static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr) { unsigned long ret = 0UL; @@ -376,6 +377,7 @@ static inline unsigned long kvirt_to_pa(unsigned long adr) ret = __pa(kva); return ret; } +#endif int comedi_buf_put(comedi_async *async, sampl_t x); int comedi_buf_get(comedi_async *async, sampl_t *x); diff --git a/include/linux/init.h b/include/linux/init.h index 0fe3fe0d..52533737 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -11,7 +11,11 @@ #define __devinitdata __initdata #define __exit #endif +#if LINUX_VERSION_CODE < 0x020200 +#define __init +#else #include_next +#endif #endif diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index d24c4ae8..7811990e 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -12,6 +12,7 @@ #else #include_next +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 2, 18) extern inline void * vmalloc_32(unsigned long size) @@ -20,7 +21,6 @@ extern inline void * vmalloc_32(unsigned long size) } #endif // 2.2.18 -#endif #endif -- 2.26.2