===== arch/alpha/Kconfig 1.19 vs edited ===== --- 1.19/arch/alpha/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/alpha/Kconfig Wed Jun 25 05:21:45 2003 @@ -665,32 +665,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI support" - -config SCSI - tristate "SCSI support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu if PCI source "drivers/message/fusion/Kconfig" ===== arch/arm/Kconfig 1.24 vs edited ===== --- 1.24/arch/arm/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/arm/Kconfig Wed Jun 25 05:21:45 2003 @@ -898,32 +898,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI support" - -config SCSI - tristate "SCSI support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu source "drivers/ieee1394/Kconfig" ===== arch/arm26/Kconfig 1.2 vs edited ===== --- 1.2/arch/arm26/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/arm26/Kconfig Wed Jun 25 05:21:45 2003 @@ -364,31 +364,7 @@ endmenu -menu "SCSI support" - -config SCSI - tristate "SCSI support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu source "drivers/isdn/Kconfig" ===== arch/cris/Kconfig 1.10 vs edited ===== --- 1.10/arch/cris/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/cris/Kconfig Wed Jun 25 05:21:45 2003 @@ -533,32 +533,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI support" - -config SCSI - tristate "SCSI support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu source "drivers/ieee1394/Kconfig" ===== arch/i386/Kconfig 1.62 vs edited ===== --- 1.62/arch/i386/Kconfig Thu Jun 19 11:06:56 2003 +++ edited/arch/i386/Kconfig Wed Jun 25 05:21:45 2003 @@ -1206,32 +1206,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI device support" - -config SCSI - tristate "SCSI device support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu menu "Old CD-ROM drivers (not SCSI, not IDE)" ===== arch/ia64/Kconfig 1.33 vs edited ===== --- 1.33/arch/ia64/Kconfig Mon Jun 23 18:41:53 2003 +++ edited/arch/ia64/Kconfig Wed Jun 25 05:21:45 2003 @@ -557,31 +557,7 @@ endif -menu "SCSI support" - -config SCSI - tristate "SCSI support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu source "net/Kconfig" ===== arch/m68k/Kconfig 1.16 vs edited ===== --- 1.16/arch/m68k/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/m68k/Kconfig Wed Jun 25 05:21:45 2003 @@ -585,32 +585,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI device support" - -config SCSI - tristate "SCSI device support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu source "net/Kconfig" ===== arch/m68knommu/Kconfig 1.15 vs edited ===== --- 1.15/arch/m68knommu/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/m68knommu/Kconfig Wed Jun 25 05:21:45 2003 @@ -527,21 +527,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI device support" - -config SCSI - tristate "SCSI device support" - help - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - source "drivers/scsi/Kconfig" - -endmenu menu "Old CD-ROM drivers (not SCSI, not IDE)" ===== arch/mips/Kconfig-shared 1.1 vs edited ===== --- 1.1/arch/mips/Kconfig-shared Mon Jun 23 13:07:11 2003 +++ edited/arch/mips/Kconfig-shared Wed Jun 25 05:23:06 2003 @@ -1216,32 +1216,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI device support" - -config SCSI - tristate "SCSI device support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu menu "Old CD-ROM drivers (not SCSI, not IDE)" ===== arch/parisc/Kconfig 1.16 vs edited ===== --- 1.16/arch/parisc/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/parisc/Kconfig Wed Jun 25 05:21:45 2003 @@ -182,33 +182,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI support" - -config SCSI - tristate "SCSI support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - -source drivers/scsi/Kconfig - - -endmenu +source "drivers/scsi/Kconfig" source "drivers/md/Kconfig" ===== arch/ppc/Kconfig 1.26 vs edited ===== --- 1.26/arch/ppc/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/ppc/Kconfig Wed Jun 25 05:21:45 2003 @@ -1175,32 +1175,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI support" - -config SCSI - tristate "SCSI support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu source "drivers/message/fusion/Kconfig" ===== arch/ppc64/Kconfig 1.22 vs edited ===== --- 1.22/arch/ppc64/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/ppc64/Kconfig Wed Jun 25 05:21:45 2003 @@ -253,32 +253,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI device support" - -config SCSI - tristate "SCSI device support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu source "drivers/md/Kconfig" ===== arch/s390/Kconfig 1.12 vs edited ===== --- 1.12/arch/s390/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/s390/Kconfig Wed Jun 25 05:21:45 2003 @@ -231,14 +231,7 @@ source "drivers/base/Kconfig" -menu "SCSI support" - -config SCSI - tristate "SCSI support" - source "drivers/scsi/Kconfig" - -endmenu source "drivers/s390/Kconfig" ===== arch/sh/Kconfig 1.14 vs edited ===== --- 1.14/arch/sh/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/sh/Kconfig Wed Jun 25 05:21:45 2003 @@ -777,32 +777,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI device support" - -config SCSI - tristate "SCSI device support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu menu "Old CD-ROM drivers (not SCSI, not IDE)" ===== arch/sparc/Kconfig 1.17 vs edited ===== --- 1.17/arch/sparc/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/sparc/Kconfig Wed Jun 25 05:21:45 2003 @@ -481,32 +481,7 @@ source "drivers/isdn/Kconfig" - -menu "SCSI support" - -config SCSI - tristate "SCSI support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu source "drivers/fc4/Kconfig" ===== arch/sparc64/Kconfig 1.24 vs edited ===== --- 1.24/arch/sparc64/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/sparc64/Kconfig Wed Jun 25 05:21:45 2003 @@ -675,32 +675,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI support" - -config SCSI - tristate "SCSI support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu source "drivers/fc4/Kconfig" ===== arch/v850/Kconfig 1.14 vs edited ===== --- 1.14/arch/v850/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/v850/Kconfig Wed Jun 25 05:21:45 2003 @@ -265,15 +265,6 @@ source "drivers/ide/Kconfig" -config SCSI - tristate "SCSI device support" - help - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - source "drivers/scsi/Kconfig" endmenu ===== arch/x86_64/Kconfig 1.24 vs edited ===== --- 1.24/arch/x86_64/Kconfig Thu Jun 19 11:23:30 2003 +++ edited/arch/x86_64/Kconfig Wed Jun 25 05:21:45 2003 @@ -407,32 +407,7 @@ source "drivers/ide/Kconfig" - -menu "SCSI device support" - -config SCSI - tristate "SCSI device support" - ---help--- - If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or - any other SCSI device under Linux, say Y and make sure that you know - the name of your SCSI host adapter (the card inside your computer - that "speaks" the SCSI protocol, also called SCSI controller), - because you will be asked for it. - - You also need to say Y here if you want support for the parallel - port version of the 100 MB IOMEGA ZIP drive. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read and - . However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. - source "drivers/scsi/Kconfig" - -endmenu source "drivers/md/Kconfig" ===== drivers/scsi/Kconfig 1.23 vs edited ===== --- 1.23/drivers/scsi/Kconfig Thu Jun 5 17:09:41 2003 +++ edited/drivers/scsi/Kconfig Wed Jun 25 05:28:04 2003 @@ -1,3 +1,27 @@ +menu "SCSI device support" + +config SCSI + tristate "SCSI device support" + ---help--- + If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or + any other SCSI device under Linux, say Y and make sure that you know + the name of your SCSI host adapter (the card inside your computer + that "speaks" the SCSI protocol, also called SCSI controller), + because you will be asked for it. + + You also need to say Y here if you have a device which speaks + the SCSI protocol. Examples of this include the parallel port + version of the IOMEGA ZIP drive, USB storage devices, Fibre + Channel, FireWire storage and the IDE-SCSI emulation driver. + + This driver is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called scsi_mod. If you want to compile it as + a module, say M here and read and + . However, do not compile this as a + module if your root file system (the one containing the directory /) + is located on a SCSI device. + comment "SCSI support type (disk, tape, CD-ROM)" depends on SCSI @@ -5,9 +29,10 @@ tristate "SCSI disk support" depends on SCSI ---help--- - If you want to use a SCSI hard disk or the SCSI or parallel port - version of the IOMEGA ZIP drive under Linux, say Y and read the - SCSI-HOWTO, the Disk-HOWTO and the Multi-Disk-HOWTO, available from + If you want to use SCSI hard disks, Fibre Channel disks, + USB storage or the SCSI or parallel port version of + the IOMEGA ZIP drive, say Y and read the SCSI-HOWTO, + the Disk-HOWTO and the Multi-Disk-HOWTO, available from . This is NOT for SCSI CD-ROMs. @@ -65,10 +90,10 @@ tristate "SCSI CDROM support" depends on SCSI ---help--- - If you want to use a SCSI CD-ROM under Linux, say Y and read the - SCSI-HOWTO and the CD-ROM-HOWTO at - . Also make sure to say Y - or M to "ISO 9660 CD-ROM file system support" later. + If you want to use a SCSI or FireWire CD-ROM under Linux, + say Y and read the SCSI-HOWTO and the CDROM-HOWTO at + . Also make sure to say + Y or M to "ISO 9660 CD-ROM file system support" later. This driver is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). @@ -1823,3 +1848,4 @@ source "drivers/scsi/pcmcia/Kconfig" +endmenu .