1 files changed, 1 insertions, 26 deletions

diff --git a/drivers/scsi/qla2xxx/qla_settings.h b/drivers/scsi/qla2xxx/qla_settings.h
index c58f5faad9e1..d85fbbed79cc 100644
--- a/drivers/scsi/qla2xxx/qla_settings.h
+++ b/drivers/scsi/qla2xxx/qla_settings.h
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.6.x
- * Copyright (C) 2003-2004 QLogic Corporation
+ * Copyright (C) 2003-2005 QLogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -22,33 +22,8 @@
  */
 #define DEBUG_QLA2100           0       /* For Debug of qla2x00 */
 
-#define STOP_ON_RESET           0
 #define USE_ABORT_TGT           1       /* Use Abort Target mbx cmd */
 
-#define VSA                     0       /* Volume Set Addressing */
-
-/* Failover options */
-#define MAX_RECOVERYTIME        10      /*
-                                         * Max suspend time for a lun recovery
-                                         * time
-                                         */
-#define MAX_FAILBACKTIME        5       /* Max suspend time before fail back */
-
-#define QLA_CMD_TIMER_DELTA     3
-
-/* 
- * When a lun is suspended for the "Not Ready" condition then it will suspend
- * the lun for increments of 6 sec delays.  SUSPEND_COUNT is that count.
- */
-#define SUSPEND_COUNT           10      /* 6 secs * 10 retries = 60 secs */
-
-/*
- * Defines the time in seconds that the driver extends the command timeout to
- * get around the problem where the mid-layer only allows 5 retries for
- * commands that return BUS_BUSY
- */
-#define EXTEND_CMD_TIMEOUT      60
-
 #define MAX_RETRIES_OF_ISP_ABORT        5
 
 /* Max time to wait for the loop to be in LOOP_READY state */