Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-microblaze.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index fc06945..eedec61 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -87,6 +87,14 @@ config ACPI_SPCR_TABLE
          This table provides information about the configuration of the
          earlycon console.
 
+config ACPI_FPDT
+       bool "ACPI Firmware Performance Data Table (FPDT) support"
+       depends on X86_64
+       help
+         Enable support for the Firmware Performance Data Table (FPDT).
+         This table provides information on the timing of the system
+         boot, S3 suspend and S3 resume firmware code paths.
+
 config ACPI_LPIT
        bool
        depends on X86_64
@@ -327,21 +335,7 @@ config ACPI_THERMAL
          the module will be called thermal.
 
 config ACPI_PLATFORM_PROFILE
-       tristate "ACPI Platform Profile Driver"
-       default m
-       help
-         This driver adds support for platform-profiles on platforms that
-         support it.
-
-         Platform-profiles can be used to control the platform behaviour. For
-         example whether to operate in a lower power mode, in a higher
-         power performance mode or between the two.
-
-         This driver provides the sysfs interface and is used as the registration
-         point for platform specific drivers.
-
-         Which profiles are supported is determined on a per-platform basis and
-         should be obtained from the platform specific driver.
+       tristate
 
 config ACPI_CUSTOM_DSDT_FILE
        string "Custom DSDT Table file to include"