Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6] / arch / um / Kconfig.char

diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char
index 9a78d354f0b40e104a9d5542926e3a6b75cf25e8..1b238ebae6b39973cbf7d57b0d7dbe8a40f49a06 100644 (file)
--- a/arch/um/Kconfig.char
+++ b/arch/um/Kconfig.char
@@ -18,7 +18,7 @@ config SSL
           lines on the UML that are usually made to show up on the host as
           ttys or ptys.
 
           lines on the UML that are usually made to show up on the host as
           ttys or ptys.
 

-          See <http://user-mode-linux.sourceforge.net/input.html> for more
+          See <http://user-mode-linux.sourceforge.net/old/input.html> for more

           information and command line examples of how to use this facility.
 
           Unless you have a specific reason for disabling this, say Y.
           information and command line examples of how to use this facility.
 
           Unless you have a specific reason for disabling this, say Y.


@@ -145,14 +145,14 @@ config LEGACY_PTYS
          systems, it is safe to say N.
 
 config RAW_DRIVER
          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.
 
         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
           with the O_DIRECT flag.
 
 config MAX_RAW_DEVS