diff --git a/config-generic b/config-generic
index ee3e39bf3..4bbf1c66f 100644
--- a/config-generic
+++ b/config-generic
@@ -3022,7 +3022,10 @@ CONFIG_USB_SUPPORT=y
 #
 # Miscellaneous USB options
 #
-CONFIG_USB_DEVICEFS=y
+
+# Deprecated.
+# CONFIG_USB_DEVICEFS is not set
+
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_SUSPEND=y
 
diff --git a/kernel.spec b/kernel.spec
index feb8413a0..5523852be 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2370,6 +2370,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Feb 28 2012 Dave Jones <davej@redhat.com>
+- Disable CONFIG_USB_DEVICEFS (Deprecated).
+
 * Tue Feb 28 2012 Justin M. Forbes <jforbes@redhat.com> 
 - CVE-2012-1090 CIFS: fix dentry refcount leak when opening a FIFO on lookup (rhbz 798296)