Merge branch 'acpi-assorted'

[karo-tx-linux.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 8fcae6df0a4236a12d486dc2d8b6fa6288001769..100bd724f64828e3c42f4e664ced388f346f01e4 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -298,14 +298,6 @@ config ACPI_DEBUG
          Documentation/kernel-parameters.txt to control the type and
          amount of debug output.
 
-config ACPI_DEBUG_FUNC_TRACE
-       bool "Additionally enable ACPI function tracing"
-       default n
-       depends on ACPI_DEBUG
-       help
-         ACPI Debug Statements slow down ACPI processing. Function trace
-         is about half of the penalty and is rarely useful.
-
 config ACPI_PCI_SLOT
        bool "PCI slot detection driver"
        depends on SYSFS