diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /include/media/saa7146.h | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'include/media/saa7146.h')
| -rw-r--r-- | include/media/saa7146.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 2f68f4cd0037..c5a6e22a4b37 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h | |||
| @@ -24,13 +24,13 @@ | |||
| 24 | 24 | ||
| 25 | extern unsigned int saa7146_debug; | 25 | extern unsigned int saa7146_debug; |
| 26 | 26 | ||
| 27 | //#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__) | 27 | //#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,__func__) |
| 28 | 28 | ||
| 29 | #ifndef DEBUG_VARIABLE | 29 | #ifndef DEBUG_VARIABLE |
| 30 | #define DEBUG_VARIABLE saa7146_debug | 30 | #define DEBUG_VARIABLE saa7146_debug |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | #define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME,__FUNCTION__) | 33 | #define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME, __func__) |
| 34 | #define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; } | 34 | #define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; } |
| 35 | 35 | ||
| 36 | #define ERR(x) { DEBUG_PROLOG; printk x; } | 36 | #define ERR(x) { DEBUG_PROLOG; printk x; } |