Skip to contentSkip to conversation

fix compilation of drivers/telephony/ixj.c

PATCH New Adrian Bunk 1 participant 1 message Feb 25, 2003

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix compilation of drivers/telephony/ixj.c

I got the following compile error in 2.5.63:

<-- snip -->

...
gcc -Wp,-MD,drivers/telephony/.ixj.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=ixj -DKBUILD_MODNAME=ixj -c -o drivers/telephony/ixj.o drivers/telephony/ixj.c
drivers/telephony/ixj.c: In function `ixj_probe_isapnp':
drivers/telephony/ixj.c:7720: too many arguments to function `pnp_activate_dev'
...
make[2]: *** [drivers/telephony/ixj.o] Error 1

<-- snip -->

The following patch fixes it:

drivers/telephony/ixj.c renamed from drivers/telephony/ixj.c.old +1 -1
@@ -7717,7 +7717,7 @@
 				printk("pnp attach failed %d \n", result);
 				break;
 			}
-			if (pnp_activate_dev(dev, NULL) < 0) {
+			if (pnp_activate_dev(dev) < 0) {
 				printk("pnp activate 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