diff options
| author | Bernd Petrovitsch <bernd@firmix.at> | 2005-09-23 00:43:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 01:17:34 -0400 |
| commit | e1e70a262d5cb5a02d2fc171e0178197849482d4 (patch) | |
| tree | 571e4e06fa1504d4198675a60de73268b7733419 /drivers/media/video/bttvp.h | |
| parent | f71626a461e7d4af099ca71830ea530e96c22e11 (diff) | |
[PATCH] Rename vprintk define in bttpvp.h
Rename the (apparently) bttv intern #define vprintk to verbprintk to
resolve a name clash.
Reason: vprintk() is defined in include/linux/kernel.h similar to printk
but with a va_list argument.
(akpm: I changed it to bttv_printk)
Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/bttvp.h')
| -rw-r--r-- | drivers/media/video/bttvp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h index 9b0b7ca035f8..7a312f79340a 100644 --- a/drivers/media/video/bttvp.h +++ b/drivers/media/video/bttvp.h | |||
| @@ -221,7 +221,7 @@ extern void bttv_gpio_tracking(struct bttv *btv, char *comment); | |||
| 221 | extern int init_bttv_i2c(struct bttv *btv); | 221 | extern int init_bttv_i2c(struct bttv *btv); |
| 222 | extern int fini_bttv_i2c(struct bttv *btv); | 222 | extern int fini_bttv_i2c(struct bttv *btv); |
| 223 | 223 | ||
| 224 | #define vprintk if (bttv_verbose) printk | 224 | #define bttv_printk if (bttv_verbose) printk |
| 225 | #define dprintk if (bttv_debug >= 1) printk | 225 | #define dprintk if (bttv_debug >= 1) printk |
| 226 | #define d2printk if (bttv_debug >= 2) printk | 226 | #define d2printk if (bttv_debug >= 2) printk |
| 227 | 227 | ||