Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes

[linux-2.6] / drivers / scsi / qla2xxx / qla_settings.h

diff --git a/drivers/scsi/qla2xxx/qla_settings.h b/drivers/scsi/qla2xxx/qla_settings.h
index 363205c0e84fa1e9f7a7e6c8a8f44330fe72676d..2801c2664b40a6186b9e0ba058a02bd3a9eef353 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_settings.h
+++ b/drivers/scsi/qla2xxx/qla_settings.h
@@ -1,27 +1,12 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2005 QLogic Corporation
+ * Copyright (c)  2003-2008 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
-/*
- * Compile time Options:
- *     0 - Disable and 1 - Enable
- */
-#define DEBUG_QLA2100          0       /* For Debug of qla2x00 */
-
-#define USE_ABORT_TGT          1       /* Use Abort Target mbx cmd */
-
 #define MAX_RETRIES_OF_ISP_ABORT       5
 
 /* Max time to wait for the loop to be in LOOP_READY state */
 #define MAX_LOOP_TIMEOUT       (60 * 5)
-#define EH_ACTIVE              1       /* Error handler active */
-
-/*
- * Some vendor subsystems do not recover properly after a device reset.  Define
- * the following to force a logout after a successful device reset.
- */
-#undef LOGOUT_AFTER_DEVICE_RESET
 
 #include "qla_version.h"