Re: Linux 2.4.17-rc1

[Erik Andersen]

On Thu Dec 13, 2001 at 06:44:16PM -0200, Marcelo Tosatti wrote:
> 
> Hi, 
> 
> I've just copied 2.4.17-rc1 to ftp.kernel.org... Its mirroring yet,
> probably.
> 
> Well, I want people with the "unfreeable" buffer/cache problem to confirm
> with me that 2.4.17-rc1 is working ok.
> 
> The same change which should fix that problem also should make 2.4 a bit
> less "swap happy".
> 
[---------snip-----------]
> 
> pre6:
> 
[---------snip-----------]
> - Fix lots of core NCR5380 bugs			(Alan Cox)

This fix from -pre6 broke NCR5380 so that it does not compile
when linked into the kernel (i.e.  not as a module).  This patch
fixes it.  Please apply for 2.4.17-rc2, 

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--

--- drivers/scsi.orig/g_NCR5380.c	Mon Dec 17 18:08:08 2001
+++ drivers/scsi/g_NCR5380.c	Mon Dec 17 18:22:34 2001
@@ -911,41 +911,7 @@
 MODULE_DEVICE_TABLE(isapnp, id_table);
 
 
-#ifndef MODULE
-
-static int __init do_NCR53C400_setup(char *str)
-{
-	int ints[10];
-
-	get_options(str, sizeof(ints) / sizeof(int), ints);
-	generic_NCR53C400_setup(str, ints);
-
-	return 1;
-}
-
-static int __init do_NCR53C400A_setup(char *str)
-{
-	int ints[10];
-
-	get_options(str, sizeof(ints) / sizeof(int), ints);
-	generic_NCR53C400A_setup(str, ints);
-
-	return 1;
-}
-
-static int __init do_DTC3181E_setup(char *str)
-{
-	int ints[10];
-
-	get_options(str, sizeof(ints) / sizeof(int), ints);
-	generic_DTC3181E_setup(str, ints);
-
-	return 1;
-}
-
 __setup("ncr5380=", do_NCR5380_setup);
 __setup("ncr53c400=", do_NCR53C400_setup);
 __setup("ncr53c400a=", do_NCR53C400A_setup);
 __setup("dtc3181e=", do_DTC3181E_setup);
-
-#endif