patch-2.1.1 linux/drivers/scsi/53c7,8xx.c

Next file: linux/drivers/scsi/AM53C974.c
Previous file: linux/drivers/pci/pci.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.0/linux/drivers/scsi/53c7,8xx.c linux/drivers/scsi/53c7,8xx.c
@@ -248,14 +248,11 @@
 #include <linux/proc_fs.h>
 #include <linux/string.h>
 #include <linux/malloc.h>
+#include <linuxv/malloc.h>
 #include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/time.h>
-#ifdef LINUX_1_2
-#include "../block/blk.h"
-#else
 #include <linux/blk.h>
-#endif
 #undef current
 
 #include "scsi.h"

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov