diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-28 21:54:25 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-28 21:54:25 -0600 |
| commit | 867f09ddc4c765a136402a0bd10a54ec45b7d820 (patch) | |
| tree | 64fe137c2c3ac2eee361ae8f4b7b6814719d2b8c /linux/drivers/media/video/tda9840.c | |
| parent | da1de2e42e2a5c0290c15edbbd4017176ff0b1c2 (diff) | |
| parent | fe57e9e343b68651e0666447d96d2db4fbb0a83d (diff) | |
| download | mediapointer-dvb-s2-867f09ddc4c765a136402a0bd10a54ec45b7d820.tar.gz mediapointer-dvb-s2-867f09ddc4c765a136402a0bd10a54ec45b7d820.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/tda9840.c')
| -rw-r--r-- | linux/drivers/media/video/tda9840.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/media/video/tda9840.c b/linux/drivers/media/video/tda9840.c index 42a842aec..cc6de147c 100644 --- a/linux/drivers/media/video/tda9840.c +++ b/linux/drivers/media/video/tda9840.c @@ -35,8 +35,13 @@ static int debug = 0; /* insmod parameter */ module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) #define dprintk(args...) \ do { if (debug) { printk("%s: %s()[%d]: ",__stringify(KBUILD_MODNAME), __FUNCTION__, __LINE__); printk(args); } } while (0) +#else +#define dprintk(args...) \ + do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0) +#endif #define SWITCH 0x00 #define LEVEL_ADJUST 0x02 |