diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-09 17:17:32 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-09 17:17:32 +0000 |
| commit | 6807eba35cc91e109fed1df6038c424496cf2add (patch) | |
| tree | 475351eb821b9e5a741faa5ba2f97e27cbf2e857 /linux/include/media/saa7146.h | |
| parent | 1faa3dcb3917ba99177697e1b8b4473e388744f8 (diff) | |
| download | mediapointer-dvb-s2-6807eba35cc91e109fed1df6038c424496cf2add.tar.gz mediapointer-dvb-s2-6807eba35cc91e109fed1df6038c424496cf2add.tar.bz2 | |
Several i2C cleanups to compile on both current linux and kernels >2.6.15
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/include/media/saa7146.h')
| -rw-r--r-- | linux/include/media/saa7146.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index e5be2b9b8..760ae6324 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -13,6 +13,7 @@ #include <linux/stringify.h> #include <linux/vmalloc.h> /* for vmalloc() */ #include <linux/mm.h> /* for vmalloc_to_page() */ +#include "compat.h" #define SAA7146_VERSION_CODE 0x000500 /* 0.5.0 */ @@ -21,14 +22,23 @@ extern unsigned int saa7146_debug; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) //#define DEBUG_PROLOG printk("(0x%08x)(0x%08x) %s: %s(): ",(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,RPS_ADDR0))),(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,IER))),__stringify(KBUILD_MODNAME),__FUNCTION__) +#else +//#define DEBUG_PROLOG printk("(0x%08x)(0x%08x) %s: %s(): ",(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,RPS_ADDR0))),(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,IER))),KBUILD_MODNAME,__FUNCTION__) +#endif #ifndef DEBUG_VARIABLE #define DEBUG_VARIABLE saa7146_debug #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) #define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_MODNAME),__FUNCTION__) #define INFO(x) { printk("%s: ",__stringify(KBUILD_MODNAME)); printk x; } +#else +#define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME,__FUNCTION__) +#define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; } +#endif #define ERR(x) { DEBUG_PROLOG; printk x; } |