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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
  [SCSI] usbstorage: use last_sector_bug flag universally
  [SCSI] libsas: abstract STP task status into a function
  [SCSI] ultrastor: clean up inline asm warnings
  [SCSI] aic7xxx: fix firmware build
  [SCSI] aacraid: fib context lock for management ioctls
  [SCSI] ch: remove forward declarations
  [SCSI] ch: fix device minor number management bug
  [SCSI] ch: handle class_device_create failure properly
  [SCSI] NCR5380: fix section mismatch
  [SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
  [SCSI] IB/iSER: add logical unit reset support
  [SCSI] don't use __GFP_DMA for sense buffers if not required
  [SCSI] use dynamically allocated sense buffer
  [SCSI] scsi.h: add macro for enclosure bit of inquiry data
  [SCSI] sd: add fix for devices with last sector access problems
  [SCSI] fix pcmcia compile problem
  [SCSI] aacraid: add Voodoo Lite class of cards.
  [SCSI] aacraid: add new driver features flags
  [SCSI] qla2xxx: Update version number to 8.02.00-k7.
  [SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
  ...

1 files changed, 3 insertions, 29 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 184c7ae78519..3e161cd66463 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -341,7 +341,7 @@ config ISCSI_TCP
          The userspace component needed to initialize the driver, documentation,
          and sample configuration files can be found here:
 
-         http://linux-iscsi.sf.net
+         http://open-iscsi.org
 
 config SGIWD93_SCSI
         tristate "SGI WD93C93 SCSI Driver"
@@ -573,10 +573,10 @@ config SCSI_ARCMSR_AER
 source "drivers/scsi/megaraid/Kconfig.megaraid"
 
 config SCSI_HPTIOP
-        tristate "HighPoint RocketRAID 3xxx Controller support"
+        tristate "HighPoint RocketRAID 3xxx/4xxx Controller support"
         depends on SCSI && PCI
         help
-          This option enables support for HighPoint RocketRAID 3xxx
+          This option enables support for HighPoint RocketRAID 3xxx/4xxx
           controllers.
 
           To compile this driver as a module, choose M here; the module
@@ -1288,17 +1288,6 @@ config SCSI_PAS16
           To compile this driver as a module, choose M here: the
           module will be called pas16.
 
-config SCSI_PSI240I
-        tristate "PSI240i support"
-        depends on ISA && SCSI
-        help
-          This is support for the PSI240i EIDE interface card which acts as a
-          SCSI host adapter.  Please read the SCSI-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called psi240i.
-
 config SCSI_QLOGIC_FAS
         tristate "Qlogic FAS SCSI support"
         depends on ISA && SCSI
@@ -1359,21 +1348,6 @@ config SCSI_LPFC
           This lpfc driver supports the Emulex LightPulse
           Family of Fibre Channel PCI host adapters.
 
-config SCSI_SEAGATE
-        tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support"
-        depends on X86 && ISA && SCSI
-        select CHECK_SIGNATURE
-        ---help---
-          These are 8-bit SCSI controllers; the ST-01 is also supported by
-          this driver.  It is explained in section 3.9 of the SCSI-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>.  If it
-          doesn't work out of the box, you may have to change some macros at
-          compiletime, which are described in <file:drivers/scsi/seagate.c>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called seagate.
-
-# definitely looks not 64bit safe:
 config SCSI_SIM710
         tristate "Simple 53c710 SCSI support (Compaq, NCR machines)"
         depends on (EISA || MCA) && SCSI