diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 23:33:12 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 23:33:12 +0300 |
| commit | c13aca79ff3c4af5fd31a5b2743a90eba6e36a26 (patch) | |
| tree | 8f77894f61822d1ae5285c07c801af7c62f71afd /drivers/acpi/Kconfig | |
| parent | 40f7090bb1b4ec327ea1e1402ff5783af5b35195 (diff) | |
| parent | 5ca4d1ae9bad0f59bd6f851c39b19f5366953666 (diff) | |
| download | linux-c13aca79ff3c4af5fd31a5b2743a90eba6e36a26.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 4.18 merge window.
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index f505e9a01b2d..516d7b36d6fb 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -105,14 +105,14 @@ config ACPI_PROCFS_POWER deprecated power /proc/acpi/ directories to exist, even when they have been replaced by functions in /sys. The deprecated directories (and their replacements) include: - /proc/acpi/battery/* (/sys/class/power_supply/*) - /proc/acpi/ac_adapter/* (sys/class/power_supply/*) + /proc/acpi/battery/* (/sys/class/power_supply/*) and + /proc/acpi/ac_adapter/* (sys/class/power_supply/*). This option has no effect on /proc/acpi/ directories - and functions, which do not yet exist in /sys + and functions which do not yet exist in /sys. This option, together with the proc directories, will be deleted in the future. - Say N to delete power /proc/acpi/ directories that have moved to /sys/ + Say N to delete power /proc/acpi/ directories that have moved to /sys. config ACPI_REV_OVERRIDE_POSSIBLE bool "Allow supported ACPI revision to be overridden" @@ -217,6 +217,19 @@ config ACPI_FAN To compile this driver as a module, choose M here: the module will be called fan. +config ACPI_TAD + tristate "ACPI Time and Alarm (TAD) Device Support" + depends on SYSFS && PM_SLEEP + help + The ACPI Time and Alarm (TAD) device is an alternative to the Real + Time Clock (RTC). Its wake timers allow the system to transition from + the S3 (or optionally S4/S5) state to S0 state after a time period + elapses. In comparison with the RTC Alarm, the TAD provides a larger + scale of flexibility in the wake timers. The time capabilities of the + TAD maintain the time of day information across platform power + transitions, and keep track of time even when the platform is turned + off. + config ACPI_DOCK bool "Dock" help |