[patch] 2.5.70-mm2: aha1740.c doesn't compile. (fwd)

[Adrian Bunk]

The problem described below still exists in 2.5.72. A patch to fix it 
is:

--- linux-2.5.72/drivers/scsi/aha1740.c.old	2003-06-18 00:36:51.000000000 +0200
+++ linux-2.5.72/drivers/scsi/aha1740.c	2003-06-18 00:36:55.000000000 +0200
@@ -102,6 +102,7 @@
     if (len > length)
 	len = length;
     return len;
+}
 
 
 static int aha1740_makecode(unchar *sense, unchar *status)

I've tested the compilation with 2.5.72.

Please apply
Adrian

----- Forwarded message from Adrian Bunk <[e-mail]> -----

Date:	Thu, 29 May 2003 21:40:03 +0200
From: Adrian Bunk <[e-mail]>
To: Andrew Morton <[e-mail]>,
    Christoph Hellwig <[e-mail]>
Cc: [e-mail],
    [e-mail]
Subject: [patch] 2.5.70-mm2: aha1740.c doesn't compile.

It seems the following compile error comes from Linus' tree:

<--  snip  -->

...
  CC      drivers/scsi/aha1740.o
...
drivers/scsi/aha1740.c:613: syntax error at end of input
...
make[2]: *** [drivers/scsi/aha1740.o] Error 1

<--  snip  -->

The culprit is the following bogus part of a patch (please _revert_ it):

linux-2.5.70/drivers/scsi/aha1740.c	2003-05-26 19:16:33.000000000 -0700
25/drivers/scsi/aha1740.c	2003-05-28 23:52:00.000000000 -0700
@@ -108,7 +102,6 @@ static int aha1740_proc_info(char *buffe
     if (len > length)
 	len = length;
     return len;
-}
 
 
 static int aha1740_makecode(unchar *sense, unchar *status)

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