diff --git a/[refs] b/[refs]
index b99fef92bbfe..54c4c0a33a46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f7e53096c93f0bdf2205134dfc541d0c3cc6e41
+refs/heads/master: d9b19199e4894089456aaad295023263b5225c1a
diff --git a/trunk/drivers/base/Kconfig b/trunk/drivers/base/Kconfig
index d47482fa1d21..6318f6b57360 100644
--- a/trunk/drivers/base/Kconfig
+++ b/trunk/drivers/base/Kconfig
@@ -27,8 +27,9 @@ config PREVENT_FIRMWARE_BUILD
 	  If unsure say Y here.
 
 config FW_LOADER
-	tristate "Userspace firmware loading support"
+	tristate "Userspace firmware loading support" if EMBEDDED
 	depends on HOTPLUG
+	default y
 	---help---
 	  This option is provided for the case where no in-kernel-tree modules
 	  require userspace firmware loading support, but a module built outside