Skip to contentSkip to conversation

fix compilation of g_NCR5380.c

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

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix compilation of g_NCR5380.c

In 2.5.63 I get the following compile error in drivers/scsi/g_NCR5380.c:

<-- snip -->

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

<-- snip -->

The following patch fixes it:

drivers/scsi/g_NCR5380.c renamed from drivers/scsi/g_NCR5380.c.old +1 -1
@@ -323,7 +323,7 @@
 				printk(KERN_ERR "dtc436e probe: attach failed\n");
 				continue;
 			}
-			if (pnp_activate_dev(dev, NULL) < 0) {
+			if (pnp_activate_dev(dev) < 0) {
 				printk(KERN_ERR "dtc436e probe: activate failed\n");
 				pnp_device_detach(dev);
 				continue;

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