diff options
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index e11faae81ed9..c95df0b8c880 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -56,23 +56,6 @@ config ACPI_PROCFS | |||
56 | 56 | ||
57 | Say N to delete /proc/acpi/ files that have moved to /sys/ | 57 | Say N to delete /proc/acpi/ files that have moved to /sys/ |
58 | 58 | ||
59 | config ACPI_PROCFS_POWER | ||
60 | bool "Deprecated power /proc/acpi directories" | ||
61 | depends on PROC_FS | ||
62 | help | ||
63 | For backwards compatibility, this option allows | ||
64 | deprecated power /proc/acpi/ directories to exist, even when | ||
65 | they have been replaced by functions in /sys. | ||
66 | The deprecated directories (and their replacements) include: | ||
67 | /proc/acpi/battery/* (/sys/class/power_supply/*) | ||
68 | /proc/acpi/ac_adapter/* (sys/class/power_supply/*) | ||
69 | This option has no effect on /proc/acpi/ directories | ||
70 | and functions, which do not yet exist in /sys | ||
71 | This option, together with the proc directories, will be | ||
72 | deleted in 2.6.39. | ||
73 | |||
74 | Say N to delete power /proc/acpi/ directories that have moved to /sys/ | ||
75 | |||
76 | config ACPI_EC_DEBUGFS | 59 | config ACPI_EC_DEBUGFS |
77 | tristate "EC read/write access through /sys/kernel/debug/ec" | 60 | tristate "EC read/write access through /sys/kernel/debug/ec" |
78 | default n | 61 | default n |
@@ -175,9 +158,10 @@ config ACPI_PROCESSOR | |||
175 | 158 | ||
176 | To compile this driver as a module, choose M here: | 159 | To compile this driver as a module, choose M here: |
177 | the module will be called processor. | 160 | the module will be called processor. |
161 | |||
178 | config ACPI_IPMI | 162 | config ACPI_IPMI |
179 | tristate "IPMI" | 163 | tristate "IPMI" |
180 | depends on IPMI_SI && IPMI_HANDLER | 164 | depends on IPMI_SI |
181 | default n | 165 | default n |
182 | help | 166 | help |
183 | This driver enables the ACPI to access the BMC controller. And it | 167 | This driver enables the ACPI to access the BMC controller. And it |