Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ff56383 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

uml: turn on SCSI support 



Enable (i)SCSI on UML, dunno why SCSI was deemed broken, it works like a
charm.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1e0cb0c3

arch/um/Kconfig

+1 −15
Original line number Original line Diff line number Diff line
@@ -320,21 +320,7 @@ source "crypto/Kconfig" 




source "lib/Kconfig"

source "lib/Kconfig"





menu "SCSI support"

source "drivers/scsi/Kconfig"

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/md/Kconfig"

source "drivers/md/Kconfig"

arch/um/Kconfig.scsi

deleted100644 → 0
+0 −58
Original line number Original line Diff line number Diff line 
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