diff --git a/[refs] b/[refs]
index 618d020d0bcb..d84ca7d9ec7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8054854221d9d51e381c64d365404f4c1c30f50
+refs/heads/master: 04d06ad0f1fdb499af84ae3d7969e2136a462f38
diff --git a/trunk/drivers/usb/Kconfig b/trunk/drivers/usb/Kconfig
index 15499b7e33f4..7ee61f5655ba 100644
--- a/trunk/drivers/usb/Kconfig
+++ b/trunk/drivers/usb/Kconfig
@@ -2,8 +2,12 @@
 # USB device configuration
 #
 
-menu "USB support"
+menuconfig USB_SUPPORT
+	bool "USB support"
 	depends on HAS_IOMEM
+	default y
+
+if USB_SUPPORT
 
 # Host-side USB depends on having a host controller
 # NOTE:  dummy_hcd is always an option, but it's ignored here ...
@@ -130,5 +134,4 @@ source "drivers/usb/atm/Kconfig"
 
 source "drivers/usb/gadget/Kconfig"
 
-endmenu
-
+endif # USB_SUPPORT