diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 12 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttvp.h | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 1ff494297..cb9e1c7ba 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.58 2005/09/13 16:33:03 mkrufky Exp $ + $Id: bttv-driver.c,v 1.59 2005/09/28 19:07:59 nsh Exp $ bttv - Bt848 frame grabber driver @@ -774,7 +774,7 @@ static void set_pll(struct bttv *btv) /* no PLL needed */ if (btv->pll.pll_current == 0) return; - vprintk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n", + verbose_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n", btv->c.nr,btv->pll.pll_ifreq); btwrite(0x00,BT848_TGCTRL); btwrite(0x00,BT848_PLL_XCI); @@ -782,13 +782,13 @@ static void set_pll(struct bttv *btv) return; } - vprintk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr, + verbose_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr, btv->pll.pll_ifreq, btv->pll.pll_ofreq); set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq); for (i=0; i<10; i++) { /* Let other people run while the PLL stabilizes */ - vprintk("."); + verbose_printk("."); msleep(10); if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) { @@ -796,12 +796,12 @@ static void set_pll(struct bttv *btv) } else { btwrite(0x08,BT848_TGCTRL); btv->pll.pll_current = btv->pll.pll_ofreq; - vprintk(" ok\n"); + verbose_printk(" ok\n"); return; } } btv->pll.pll_current = -1; - vprintk("failed\n"); + verbose_printk("failed\n"); return; } diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h index d12c21635..befe6834d 100644 --- a/linux/drivers/media/video/bttvp.h +++ b/linux/drivers/media/video/bttvp.h @@ -1,5 +1,5 @@ /* - $Id: bttvp.h,v 1.21 2005/07/15 21:44:14 mchehab Exp $ + $Id: bttvp.h,v 1.22 2005/09/28 19:07:59 nsh Exp $ bttv - Bt848 frame grabber driver @@ -235,9 +235,9 @@ extern void bttv_gpio_tracking(struct bttv *btv, char *comment); extern int init_bttv_i2c(struct bttv *btv); extern int fini_bttv_i2c(struct bttv *btv); -#define vprintk if (bttv_verbose) printk #define dprintk if (bttv_debug >= 1) printk #define d2printk if (bttv_debug >= 2) printk +#define verbose_printk if (bttv_verbose) printk #define BTTV_MAX_FBUF 0x208000 #define VBIBUF_SIZE (2048*VBI_MAXLINES*2) diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ce6ad1dc7..1a55edddd 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-09-28 19:07 nshmyrev + + * bttv-driver.c: (set_pll): + * bttvp.h: + - Rename vprintk to verbose_printk to fix name clash. + + Signed-off-by: Bernd Petrovitsch <bernd@firmix.at> + 2005-09-28 00:47 mchehab * msp3400.c: (msp3400c_setvolume), (msp34xx_modus), (msp_attach), |