Re: [PATCH] bttv & 2.5.48

[Javier Marcet <jmarcet@pobox.com>]

[-- Attachment #1: Type: text/plain, Size: 2155 bytes --]

* Petr Vandrovec <vandrove@vc.cvut.cz> [021118 16:12]:

>   I did not saw this patch posted... PCI now does not have its own name,
>and it uses dev's name. Please apply.


>diff -urdN linux/drivers/media/video/bttv-cards.c linux/drivers/media/video/bttv-cards.c
>--- linux/drivers/media/video/bttv-cards.c	2002-11-18 13:50:42.000000000 +0000
>+++ linux/drivers/media/video/bttv-cards.c	2002-11-18 13:55:51.000000000 +0000
>@@ -2990,7 +2990,7 @@
> 
> 	/* print which chipset we have */
> 	while ((dev = pci_find_class(PCI_CLASS_BRIDGE_HOST << 8,dev)))
>-		printk(KERN_INFO "bttv: Host bridge is %s\n",dev->name);
>+		printk(KERN_INFO "bttv: Host bridge is %s\n",dev->dev.name);
> 
> 	/* print warnings about any quirks found */
> 	if (triton1)

This fixes the second of the errors, but not the missing
AUDC_CONFIG_PINNACLE I get first:

make -f scripts/Makefile.build obj=drivers/media/radio
make -f scripts/Makefile.build obj=drivers/media/video
  gcc -Wp,-MD,drivers/media/video/.bttv-cards.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=athlon-xp -Iarch/i386/mach-generic -nostdinc -iwithprefix include -DMODULE   -DKBUILD_BASENAME=bttv_cards -DKBUILD_MODNAME=bttv   -c -o drivers/media/video/bttv-cards.o drivers/media/video/bttv-cards.c
drivers/media/video/bttv-cards.c: In function AUDC_CONFIG_PINNACLE' undeclared (first use in this function)
drivers/media/video/bttv-cards.c:1742: (Each undeclared identifier is reported only once
drivers/media/video/bttv-cards.c:1742: for each function it appears in.)
drivers/media/video/bttv-cards.c: In function name'
make[4]: *** [drivers/media/video/bttv-cards.o] Error 1
make[3]: *** [drivers/media/video] Error 2
make[2]: *** [drivers/media] Error 2
make[1]: *** [drivers] Error 2
make: *** [modules] Error 2

I know this has not changed since 2.5.47, nor couldn't spot any
difference within the /media tree, yet it fails on 2.5.48 while it
compiled fine on 2.5.47

Any idea where the error might be?


-- 
Javier Marcet <jmarcet@pobox.com>

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]