X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fbase%2FKconfig;h=5d6312e3349062cee54d204163bb5407d300a1bb;hb=cc70991d64e767729c37278cd4f80f709556079a;hp=f0eff3dac58d4db1b7d3d1da6e927cb2135ba795;hpb=9fdb62af92c741addbea15545f214a6e89460865;p=powerpc.git

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index f0eff3dac5..5d6312e334 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -20,7 +20,7 @@ config PREVENT_FIRMWARE_BUILD
 
 config FW_LOADER
 	tristate "Userspace firmware loading support"
-	select HOTPLUG
+	depends on HOTPLUG
 	---help---
 	  This option is provided for the case where no in-kernel-tree modules
 	  require userspace firmware loading support, but a module built outside
@@ -37,4 +37,20 @@ config DEBUG_DRIVER
 
 	  If you are unsure about this, say N here.
 
+config DEBUG_DEVRES
+	bool "Managed device resources verbose debug messages"
+	depends on DEBUG_KERNEL
+	help
+	  This option enables kernel parameter devres.log. If set to
+	  non-zero, devres debug messages are printed. Select this if
+	  you are having a problem with devres or want to debug
+	  resource management for a managed device. devres.log can be
+	  switched on and off from sysfs node.
+
+	  If you are unsure about this, Say N here.
+
+config SYS_HYPERVISOR
+	bool
+	default n
+
 endmenu