[SCSI] mptfusion: Increase scsi-timeouts, similariy to the LSI 4.x driver.

[linux-2.6-omap-h63xx.git] / arch / um / Kconfig.char

diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char
index 3a4b396d7979916177b30d5689b759d277eafe35..70dabd1e0652a1a0725962b28a67abcc729010f9 100644 (file)
--- a/arch/um/Kconfig.char
+++ b/arch/um/Kconfig.char
@@ -145,14 +145,14 @@ config LEGACY_PTYS
          systems, it is safe to say N.
 
 config RAW_DRIVER
-        tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"
+        tristate "RAW driver (/dev/raw/rawN)"
+       depends on BLOCK
         help
           The raw driver permits block devices to be bound to /dev/raw/rawN.
           Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O.
           See the raw(8) manpage for more details.
 
-          The raw driver is deprecated and will be removed soon.
-          Applications should simply open the device (eg /dev/hda1)
+          Applications should preferably open the device (eg /dev/hda1)
           with the O_DIRECT flag.
 
 config MAX_RAW_DEVS
@@ -203,6 +203,10 @@ config SOUND
        tristate
        default UML_SOUND
 
+config SOUND_OSS_CORE
+       bool
+       default UML_SOUND
+
 config HOSTAUDIO
        tristate
        default UML_SOUND