Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits)
  [SCSI] 53c700: remove reliance on deprecated cmnd fields
  [SCSI] hptiop: don't use cmnd->bufflen
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  [SCSI] aacraid: small misc. cleanups
  [SCSI] aacraid: Update supported product information
  [SCSI] aacraid: Fix return code interpretation
  [SCSI] scsi_transport_sas: fix panic in sas_free_rphy
  [SCSI] remove RQ_SCSI_* flags
  [SCSI] remove scsi_request infrastructure
  [SCSI] mptfusion: change driver revision to 3.03.10
  [SCSI] mptfc: abort of board reset leaves port dead requiring reboot
  [SCSI] mptfc: fix fibre channel infinite request/response loop
  [SCSI] mptfc: set fibre channel fw target missing timers to one second
  [SCSI] mptfusion: move fc event/reset handling to mptfc
  [SCSI] spi transport: don't allow dt to be set on SE or HVD buses
  [SCSI] aic7xxx: expose the bus setting to sysfs
  [SCSI] scsi: remove Documentation/scsi/cpqfc.txt
  [SCSI] drivers/scsi: Use ARRAY_SIZE macro
  [SCSI] Remove last page_address from dc395x.c
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  ...

Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to
the sparc interrupt cleanups)

1 files changed, 0 insertions, 45 deletions

diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index ff40906c66f9..8c865b9e02b5 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -24,48 +24,3 @@ config SCSI_QLA_FC
         Firmware images can be retrieved from:
 
                 ftp://ftp.qlogic.com/outgoing/linux/firmware/
-
-        NOTE: The original method of building firmware-loader
-        modules has been deprecated as the firmware-images will
-        be removed from the kernel sources.
-
-config SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-        bool "  Use firmware-loader modules (DEPRECATED)"
-        depends on SCSI_QLA_FC
-        help
-          This option offers you the deprecated firmware-loader
-          modules that have been obsoleted by the usage of the
-          Firmware Loader interface in the qla2xxx driver.
-
-config SCSI_QLA21XX
-        tristate "  Build QLogic ISP2100 firmware-module"
-        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-        ---help---
-        This driver supports the QLogic 21xx (ISP2100) host adapter family.
-
-config SCSI_QLA22XX
-        tristate "  Build QLogic ISP2200 firmware-module"
-        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-        ---help---
-        This driver supports the QLogic 22xx (ISP2200) host adapter family.
-
-config SCSI_QLA2300
-        tristate "  Build QLogic ISP2300/ISP6312 firmware-module"
-        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-        ---help---
-        This driver supports the QLogic 2300 (ISP2300, ISP2312 and
-        ISP6312) host adapter family.
-
-config SCSI_QLA2322
-        tristate "  Build QLogic ISP2322/ISP6322 firmware-module"
-        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-        ---help---
-        This driver supports the QLogic 2322 (ISP2322 and ISP6322) host
-        adapter family.
-
-config SCSI_QLA24XX
-        tristate "  Build QLogic ISP24xx firmware-module"
-        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-        ---help---
-        This driver supports the QLogic 24xx (ISP2422 and ISP2432) host
-        adapter family.