[2.5 patch] fix compilation of drivers/telephony/ixj.c

• Next message: Richard B. Johnson: "Re: atomic_t (24 bits???)"
• Previous message: Ville Herva: "Re: zImage now holds vmlinux, System.map and config in sections. (fwd)"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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:

--- linux-2.5.63-notfull/drivers/telephony/ixj.c.old 2003-02-25 19:22:34.000000000 +0100
+++ linux-2.5.63-notfull/drivers/telephony/ixj.c 2003-02-25 19:23:01.000000000 +0100
@@ -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

-- 
       "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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

• Next message: Richard B. Johnson: "Re: atomic_t (24 bits???)"
• Previous message: Ville Herva: "Re: zImage now holds vmlinux, System.map and config in sections. (fwd)"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Fri Feb 28 2003 - 22:00:30 EST