Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index bbf91aec64f555e532919f680a4702c99fcfd9b2..8616496ffc026ef24cadc8e943dc6e23e4010722 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -116,7 +116,7 @@ config CHR_DEV_OSST
          <http://www.tldp.org/docs.html#howto>  and
          <file:Documentation/scsi/osst.txt>  in the kernel source.
          More info on the OnStream driver may be found on
-         <http://linux1.onstream.nl/test/>
+         <http://sourceforge.net/projects/osst/>
          Please also have a look at the standard st docu, as most of it
          applies to osst as well.
 
@@ -156,9 +156,9 @@ config CHR_DEV_SG
          directly, so you need some additional software which knows how to
          talk to these devices using the SCSI protocol:
 
-         For scanners, look at SANE (<http://www.mostang.com/sane/>). For CD
+         For scanners, look at SANE (<http://www.sane-project.org/>). For CD
          writer software look at Cdrtools
-         (<http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html>)
+         (<http://cdrecord.berlios.de/private/cdrecord.html>)
          and for burning a "disk at once": CDRDAO
          (<http://cdrdao.sourceforge.net/>). Cdparanoia is a high
          quality digital reader of audio CDs (<http://www.xiph.org/paranoia/>).
@@ -316,7 +316,8 @@ config SCSI_ISCSI_ATTRS
 
 config SCSI_SAS_ATTRS
        tristate "SAS Transport Attributes"
-       depends on SCSI && BLK_DEV_BSG
+       depends on SCSI
+       select BLK_DEV_BSG
        help
          If you wish to export transport-specific information about
          each attached SAS device to sysfs, say Y.
@@ -378,7 +379,7 @@ config ISCSI_BOOT_SYSFS
          via sysfs to userspace. If you wish to export this information,
          say Y. Otherwise, say N.
 
-source "drivers/scsi/cxgb3i/Kconfig"
+source "drivers/scsi/cxgbi/Kconfig"
 source "drivers/scsi/bnx2i/Kconfig"
 source "drivers/scsi/be2iscsi/Kconfig"
 
@@ -950,6 +951,7 @@ config SCSI_IPS
        ---help---
          This is support for the IBM ServeRAID hardware RAID controllers.
          See <http://www.developer.ibm.com/welcome/netfinity/serveraid.html>
+         and <http://www-947.ibm.com/support/entry/portal/docdisplay?brand=5000008&lndocid=SERV-RAID>
          for more information.  If this driver does not work correctly
          without modification please contact the author by email at
          <ipslinux@adaptec.com>.
@@ -1609,7 +1611,7 @@ config SCSI_DEBUG
          host adapter with one dummy SCSI disk. Each dummy disk uses kernel
          RAM as storage (i.e. it is a ramdisk). To save space when multiple
          dummy disks are simulated, they share the same kernel RAM for 
-         their storage. See <http://www.torque.net/sg/sdebug.html> for more
+         their storage. See <http://sg.danny.cz/sg/sdebug26.html> for more
          information. This driver is primarily of use to those testing the
          SCSI and block subsystems. If unsure, say N.