On Wed, 2005-09-21 at 12:35 +0200, Bernd Petrovitsch wrote:
> The attached patched againt 2.6.13 renames 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.
Sorry for the noise, -EWRONGPATCH. Now with the correct one.
Bernd
--
Firmix Software GmbH http://www.firmix.at/
mobil: +43 664 4416156 fax: +43 1 7890849-55
Embedded Linux Development and Services
diff -uprN -X linux-2.6.13/Documentation/dontdiff linux-2.6.13/drivers/media/video/bttv-driver.c linux-2.6.13-patched/drivers/media/video/bttv-driver.c
--- linux-2.6.13/drivers/media/video/bttv-driver.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13-patched/drivers/media/video/bttv-driver.c 2005-09-21 12:19:42.000000000 +0200
@@ -761,21 +761,21 @@ 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",
- btv->c.nr,btv->pll.pll_ifreq);
+ verbprintk(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);
btv->pll.pll_current = 0;
return;
}
- vprintk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr,
- btv->pll.pll_ifreq, btv->pll.pll_ofreq);
+ verbprintk(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(".");
+ verbprintk(".");
msleep(10);
if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
@@ -783,12 +783,12 @@ static void set_pll(struct bttv *btv)
} else {
btwrite(0x08,BT848_TGCTRL);
btv->pll.pll_current = btv->pll.pll_ofreq;
- vprintk(" ok\n");
+ verbprintk(" ok\n");
return;
}
}
btv->pll.pll_current = -1;
- vprintk("failed\n");
+ verbprintk("failed\n");
return;
}
diff -uprN -X linux-2.6.13/Documentation/dontdiff linux-2.6.13/drivers/media/video/bttvp.h linux-2.6.13-patched/drivers/media/video/bttvp.h
--- linux-2.6.13/drivers/media/video/bttvp.h 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13-patched/drivers/media/video/bttvp.h 2005-09-21 12:19:59.000000000 +0200
@@ -222,7 +222,7 @@ extern void bttv_gpio_tracking(struct bt
extern int init_bttv_i2c(struct bttv *btv);
extern int fini_bttv_i2c(struct bttv *btv);
-#define vprintk if (bttv_verbose) printk
+#define verbprintk if (bttv_verbose) printk
#define dprintk if (bttv_debug >= 1) printk
#define d2printk if (bttv_debug >= 2) printk
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
| |
 |