From 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 4 Feb 2000 07:40:19 +0000
Subject: Merge with Linux 2.3.32.

---
 drivers/scsi/wd33c93.c | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'drivers/scsi/wd33c93.c')

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 7e9625108..9234c2393 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -77,12 +77,7 @@
 #include <linux/version.h>
 #include <linux/init.h>
 #include <asm/irq.h>
-
-#if LINUX_VERSION_CODE >= 0x010300
 #include <linux/blk.h>
-#else
-#include "../block/blk.h"
-#endif
 
 #include "scsi.h"
 #include "hosts.h"
@@ -1423,11 +1418,7 @@ extern void sgiwd93_reset(uchar*);
 
 
 
-#if LINUX_VERSION_CODE >= 0x010300
 int wd33c93_reset(Scsi_Cmnd *SCpnt, unsigned int reset_flags)
-#else
-int wd33c93_reset(Scsi_Cmnd *SCpnt)
-#endif
 {
 struct Scsi_Host *instance;
 struct WD33C93_hostdata *hostdata;
-- 
cgit v1.2.3