Commit f906d51c authored by Adrian Bunk's avatar Adrian Bunk Committed by James Bottomley

[PATCH] 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:
parent c879f2b7
...@@ -323,7 +323,7 @@ int __init generic_NCR5380_detect(Scsi_Host_Template * tpnt) ...@@ -323,7 +323,7 @@ int __init generic_NCR5380_detect(Scsi_Host_Template * tpnt)
printk(KERN_ERR "dtc436e probe: attach failed\n"); printk(KERN_ERR "dtc436e probe: attach failed\n");
continue; continue;
} }
if (pnp_activate_dev(dev, NULL) < 0) { if (pnp_activate_dev(dev) < 0) {
printk(KERN_ERR "dtc436e probe: activate failed\n"); printk(KERN_ERR "dtc436e probe: activate failed\n");
pnp_device_detach(dev); pnp_device_detach(dev);
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment