Skip to contentSkip to conversation

fix the compilation of radio-sf16fmi.c

PATCH New Adrian Bunk 1 participant 1 message Feb 25, 2003 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix the compilation of radio-sf16fmi.c

drivers/media/radio/radio-sf16fmi.c doesn't compile in 2.5.63:

<-- snip -->

gcc -Wp,-MD,drivers/media/radio/.radio-sf16fmi.o.d -D__KERNEL__
-Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=radio_sf16fmi -DKBUILD_MODNAME=radio_sf16fmi -c -o drivers/media/radio/radio-sf16fmi.o drivers/media/radio/radio-sf16fmi.c drivers/media/radio/radio-sf16fmi.c: In function `isapnp_fmi_probe':
drivers/media/radio/radio-sf16fmi.c:265: too many arguments to function `pnp_activate_dev'
make[3]: *** [drivers/media/radio/radio-sf16fmi.o] Error 1

<-- snip -->

It seems the following is needed:

drivers/media/radio/radio-sf16fmi.c renamed from drivers/media/radio/radio-sf16fmi.c.old +1 -1
@@ -262,7 +262,7 @@
 		return -ENODEV;
 	if (pnp_device_attach(dev) < 0)
 		return -EAGAIN;
-	if (pnp_activate_dev(dev, NULL) < 0) {
+	if (pnp_activate_dev(dev) < 0) {
 		printk ("radio-sf16fmi: PnP configure failed (out of resources?)\n");
 		pnp_device_detach(dev);
 		return -ENOMEM;

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed