Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[firefly-linux-kernel-4.4.55.git] / drivers / xen / Kconfig

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index c794ea1821402dc21e47af3d8b398c9d4f3209e6..38fb36e1c592d3d32784a46f376b161f2f6ede92 100644 (file)
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -3,7 +3,6 @@ menu "Xen driver support"
 
 config XEN_BALLOON
        bool "Xen memory balloon driver"
-       depends on !ARM
        default y
        help
          The balloon driver allows the Xen domain to request more memory from
@@ -222,7 +221,7 @@ config XEN_ACPI_PROCESSOR
 
          To do that the driver parses the Power Management data and uploads
          said information to the Xen hypervisor. Then the Xen hypervisor can
-         select the proper Cx and Pxx states. It also registers itslef as the
+         select the proper Cx and Pxx states. It also registers itself as the
          SMM so that other drivers (such as ACPI cpufreq scaling driver) will
          not load.