Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[~andy/linux] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 9fc8551a1cf685c53fce6564a004d40642bf3acc..a213260b51e5b4d8d3d64d7aebc85d2b2f21eb74 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -55,6 +55,7 @@ config HZ
        default 100
 
 source "init/Kconfig"
+source "kernel/Kconfig.freezer"
 
 menu "Processor type and features"
 
@@ -194,8 +195,8 @@ config HOTPLUG
        plugged into slots found on all modern laptop computers.  Another
        example, used on modern desktops as well as laptops, is USB.
 
-       Enable HOTPLUG and KMOD, and build a modular kernel.  Get agent
-       software (at <http://linux-hotplug.sourceforge.net/>) and install it.
+       Enable HOTPLUG and build a modular kernel.  Get agent software
+       (from <http://linux-hotplug.sourceforge.net/>) and install it.
        Then your kernel will automatically call out to a user mode "policy
        agent" (/sbin/hotplug) to load modules and set up software needed
        to use devices as you hotplug them.