diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:23:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:23:56 -0500 |
| commit | 57d1c91fa6d9146b309b7511f6432dea2a24858b (patch) | |
| tree | d7958dd87eb950cc3eeaf8b32fc372c0e7ff6702 /include | |
| parent | 47853e7fa588bef826c9799a87b33904b32bd905 (diff) | |
| parent | 37193147991a53b2e9f573d0ec47f63a2d4de8dc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/moduleparam.h | 2 | ||||
| -rw-r--r-- | include/media/saa7146.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index 368ec8e45bd0..b5c98c43779e 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #ifdef MODULE | 10 | #ifdef MODULE |
| 11 | #define MODULE_PARAM_PREFIX /* empty */ | 11 | #define MODULE_PARAM_PREFIX /* empty */ |
| 12 | #else | 12 | #else |
| 13 | #define MODULE_PARAM_PREFIX __stringify(KBUILD_MODNAME) "." | 13 | #define MODULE_PARAM_PREFIX KBUILD_MODNAME "." |
| 14 | #endif | 14 | #endif |
| 15 | 15 | ||
| 16 | #ifdef MODULE | 16 | #ifdef MODULE |
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index e5be2b9b846b..2bc634fcb7bb 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h | |||
| @@ -21,14 +21,14 @@ | |||
| 21 | 21 | ||
| 22 | extern unsigned int saa7146_debug; | 22 | extern unsigned int saa7146_debug; |
| 23 | 23 | ||
| 24 | //#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__) | 24 | //#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__) |
| 25 | 25 | ||
| 26 | #ifndef DEBUG_VARIABLE | 26 | #ifndef DEBUG_VARIABLE |
| 27 | #define DEBUG_VARIABLE saa7146_debug | 27 | #define DEBUG_VARIABLE saa7146_debug |
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | #define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_MODNAME),__FUNCTION__) | 30 | #define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME,__FUNCTION__) |
| 31 | #define INFO(x) { printk("%s: ",__stringify(KBUILD_MODNAME)); printk x; } | 31 | #define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; } |
| 32 | 32 | ||
| 33 | #define ERR(x) { DEBUG_PROLOG; printk x; } | 33 | #define ERR(x) { DEBUG_PROLOG; printk x; } |
| 34 | 34 | ||