aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 18:23:56 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 18:23:56 -0500
commit57d1c91fa6d9146b309b7511f6432dea2a24858b (patch)
treed7958dd87eb950cc3eeaf8b32fc372c0e7ff6702 /drivers/media/dvb
parent47853e7fa588bef826c9799a87b33904b32bd905 (diff)
parent37193147991a53b2e9f573d0ec47f63a2d4de8dc (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/cinergyT2/cinergyT2.c2
-rw-r--r--drivers/media/dvb/ttpci/budget.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index b996fb59b7e4..1d69bf031fb9 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -60,7 +60,7 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
60#define dprintk(level, args...) \ 60#define dprintk(level, args...) \
61do { \ 61do { \
62 if ((debug & level)) { \ 62 if ((debug & level)) { \
63 printk("%s: %s(): ", __stringify(KBUILD_MODNAME), \ 63 printk("%s: %s(): ", KBUILD_MODNAME, \
64 __FUNCTION__); \ 64 __FUNCTION__); \
65 printk(args); } \ 65 printk(args); } \
66} while (0) 66} while (0)
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index fdaa3318ad3a..c8d48cfba277 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -19,7 +19,7 @@ extern int budget_debug;
19#endif 19#endif
20 20
21#define dprintk(level,args...) \ 21#define dprintk(level,args...) \
22 do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0) 22 do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __FUNCTION__); printk(args); } } while (0)
23 23
24struct budget_info { 24struct budget_info {
25 char *name; 25 char *name;