Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0ff563830209d2f5ea2ece071f7ea71aff934544
Commit:     0ff563830209d2f5ea2ece071f7ea71aff934544
Parent:     1e0cb0c3bf04850fa6fb300293d9e85ba81b605f
Author:     Peter Zijlstra <[EMAIL PROTECTED]>
AuthorDate: Wed May 9 02:33:20 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed May 9 12:30:48 2007 -0700

    uml: turn on SCSI support
    
    Enable (i)SCSI on UML, dunno why SCSI was deemed broken, it works like a
    charm.
    
    Signed-off-by: Peter Zijlstra <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
    Cc: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/um/Kconfig      |   16 +-------------
 arch/um/Kconfig.scsi |   58 --------------------------------------------------
 2 files changed, 1 insertions(+), 73 deletions(-)

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 354cc6b..b9c0f30 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -320,21 +320,7 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-menu "SCSI support"
-depends on BROKEN
-
-config SCSI
-       tristate "SCSI support"
-
-# This gives us free_dma, which scsi.c wants.
-config GENERIC_ISA_DMA
-       bool
-       depends on SCSI
-       default y
-
-source "arch/um/Kconfig.scsi"
-
-endmenu
+source "drivers/scsi/Kconfig"
 
 source "drivers/md/Kconfig"
 
diff --git a/arch/um/Kconfig.scsi b/arch/um/Kconfig.scsi
deleted file mode 100644
index c291c94..0000000
--- a/arch/um/Kconfig.scsi
+++ /dev/null
@@ -1,58 +0,0 @@
-comment "SCSI support type (disk, tape, CD-ROM)"
-       depends on SCSI
-
-config BLK_DEV_SD
-       tristate "SCSI disk support"
-       depends on SCSI
-
-config SD_EXTRA_DEVS
-       int "Maximum number of SCSI disks that can be loaded as modules"
-       depends on BLK_DEV_SD
-       default "40"
-
-config CHR_DEV_ST
-       tristate "SCSI tape support"
-       depends on SCSI
-
-config BLK_DEV_SR
-       tristate "SCSI CD-ROM support"
-       depends on SCSI
-
-config BLK_DEV_SR_VENDOR
-       bool "Enable vendor-specific extensions (for SCSI CDROM)"
-       depends on BLK_DEV_SR
-
-config SR_EXTRA_DEVS
-       int "Maximum number of CDROM devices that can be loaded as modules"
-       depends on BLK_DEV_SR
-       default "2"
-
-config CHR_DEV_SG
-       tristate "SCSI generic support"
-       depends on SCSI
-
-comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs"
-       depends on SCSI
-
-#if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-config SCSI_DEBUG_QUEUES
-       bool "Enable extra checks in new queueing code"
-       depends on SCSI
-
-#fi
-config SCSI_MULTI_LUN
-       bool "Probe all LUNs on each SCSI device"
-       depends on SCSI
-
-config SCSI_CONSTANTS
-       bool "Verbose SCSI error reporting (kernel size +=12K)"
-       depends on SCSI
-
-config SCSI_LOGGING
-       bool "SCSI logging facility"
-       depends on SCSI
-
-config SCSI_DEBUG
-       tristate "SCSI debugging host simulator (EXPERIMENTAL)"
-       depends on SCSI
-
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to