diff --git a/[refs] b/[refs]
index 5259dd0b4460..cd98ab0b1bf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5563d722bfc73f27423fcb76240bfc1fb4284635
+refs/heads/master: 63b9871f6ee2607f3b44e0044e145574b3f08619
diff --git a/trunk/arch/um/Kconfig.char b/trunk/arch/um/Kconfig.char
index 3a4b396d7979..1b238ebae6b3 100644
--- a/trunk/arch/um/Kconfig.char
+++ b/trunk/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