From 012bb3e61e5eced6c610f9e036372bf0c8def2d1 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Oct 2000 01:18:40 +0000 Subject: Merge with Linux 2.4.0-test9. Please check DECstation, I had a number of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem. --- include/asm-sparc/floppy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm-sparc/floppy.h') diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h index 0c54061f9..5a8422926 100644 --- a/include/asm-sparc/floppy.h +++ b/include/asm-sparc/floppy.h @@ -21,7 +21,7 @@ #undef request_region #define release_region(X, Y) do { } while(0) #define check_region(X, Y) (0) -#define request_region(X, Y, Z) do { } while(0) +#define request_region(X, Y, Z) (1) /* References: * 1) Netbsd Sun floppy driver. -- cgit v1.2.3