Merge branch 'ipmi' (ipmi patches from Corey Minyard)

[cascardo/linux.git] / drivers / xen / Kconfig

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index c794ea1..38fb36e 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"
 
 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
        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
 
          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.
 
          SMM so that other drivers (such as ACPI cpufreq scaling driver) will
          not load.