Skip to contentSkip to conversation

bttv & 2.5.48

PATCH In review Petr Vandrovec 3 participants 3 messages Nov 18, 2002 – Nov 19, 2002 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bttv & 2.5.48

Hi Gerd,
I did not saw this patch posted... PCI now does not have its own name,
and it uses dev's name. Please apply.
Petr Vandrovec [email protected]

drivers/media/video/bttv-cards.c +1 -1
diff -urdN linux/drivers/media/video/bttv-cards.c linux/drivers/media/video/bttv-cards.c
@@ -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)
#1 lore raw
Quoted 8 lines · Petr Vandrovec

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

drivers/media/video/bttv-cards.c line 2996

Quoted 8 lines
drivers/media/video/bttv-cards.c +1 -1
@@ -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?

Signature · 1 line
Javier Marcet <[email protected]>
#2 lore raw
Quoted 7 lines

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

drivers/media/video/bttv-cards.c: In function AUDC_CONFIG_PINNACLE' undeclared (first use in this function)

Any idea where the error might be?

http://bytesex.org/patches/2.5/ has patches for this and other issues.

Files starting with digits are the individual patches, patch-2.5.48-kraxel.gz is the "all in one" package.

Gerd

Signature · 3 lines
You can't please everybody.  And usually if you _try_ to please
everybody, the end result is one big mess.
				-- Linus Torvalds, 2002-04-20