diff options
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/av7110/saa7146_core.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/compat.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/compat.h | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/av7110/saa7146_core.c b/linux/drivers/media/dvb/av7110/saa7146_core.c index 220163acc..326d5446a 100644 --- a/linux/drivers/media/dvb/av7110/saa7146_core.c +++ b/linux/drivers/media/dvb/av7110/saa7146_core.c @@ -27,7 +27,8 @@ #include <linux/wrapper.h> /* for mem_map_reserve */ #include <linux/init.h> #include <asm/io.h> /* for accessing the pci-device */ -#include <linux/vmalloc.h> /* for module-version */ +#include <linux/vmalloc.h> +#include <linux/mm.h> #include "saa7146_defs.h" #include "saa7146_core.h" diff --git a/linux/drivers/media/dvb/dvb-core/compat.c b/linux/drivers/media/dvb/dvb-core/compat.c index d76a0a3fc..1eb20ab9b 100644 --- a/linux/drivers/media/dvb/dvb-core/compat.c +++ b/linux/drivers/media/dvb/dvb-core/compat.c @@ -145,6 +145,7 @@ u32 crc32_le (u32 crc, unsigned char const *data, size_t len) for (i=0; i<len; i++) crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *data++) & 0xff]; + return crc; } diff --git a/linux/drivers/media/dvb/dvb-core/compat.h b/linux/drivers/media/dvb/dvb-core/compat.h index 0e1781bad..d3c58054b 100644 --- a/linux/drivers/media/dvb/dvb-core/compat.h +++ b/linux/drivers/media/dvb/dvb-core/compat.h @@ -64,9 +64,15 @@ void cond_resched (void) extern struct page * vmalloc_to_page(void *addr); +#if defined(MODVERSIONS) +#include <linux/modversions.h> +#undef remap_page_range +#define remap_page_range(vma,from,to,size,prot) \ + _set_ver(remap_page_range)(from,to,size,prot) +#else #define remap_page_range(vma,from,to,size,prot) \ remap_page_range(from,to,size,prot) - +#endif #endif |