diff options
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/cinergyT2/cinergyT2.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/budget.h | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index 47b21f54d..ec1f39f1d 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -58,6 +58,7 @@ static int debug; module_param_named(debug, debug, int, 0644); MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) #define dprintk(level, args...) \ do { \ if ((debug & level)) { \ @@ -65,6 +66,15 @@ do { \ __FUNCTION__); \ printk(args); } \ } while (0) +#else +#define dprintk(level, args...) \ +do { \ + if ((debug & level)) { \ + printk("%s: %s(): ", KBUILD_MODNAME, \ + __FUNCTION__); \ + printk(args); } \ +} while (0) +#endif enum cinergyt2_ep1_cmd { CINERGYT2_EP1_PID_TABLE_RESET = 0x01, diff --git a/linux/drivers/media/dvb/ttpci/budget.h b/linux/drivers/media/dvb/ttpci/budget.h index fdaa3318a..bff68210a 100644 --- a/linux/drivers/media/dvb/ttpci/budget.h +++ b/linux/drivers/media/dvb/ttpci/budget.h @@ -18,8 +18,13 @@ extern int budget_debug; #undef dprintk #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) #define dprintk(level,args...) \ do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0) +#else +#define dprintk(level,args...) \ + do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __FUNCTION__); printk(args); } } while (0) +#endif struct budget_info { char *name; |