ACPI: Kconfig: fold /proc/acpi/sleep under CONFIG_ACPI_PROCFS

/proc/acpi/sleep has had its own "default n" option,
ACPI_SLEEP_PROC_SLEEP, for many months.
Time to delete ACPI_SLEEP_PROC_SLEEP.

Users that still need /proc/acpi/sleep can still get it
along with the other deprecated /proc/acpi files
by enabling CONFIG_ACPI_PROCFS.

Also delete ACPI_SLEEP_PROC_FS, which was an umbrella
for /proc/acpi/sleep, wakeup, alarm, because it was
effectively just a synonym for ACPI_SLEEP.

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 1 insertions, 13 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 8e42977c6d07..efd47eeb5b63 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -62,19 +62,6 @@ config ACPI_SLEEP
           This option is not recommended for anyone except those doing driver
           power management development.
 
-config ACPI_SLEEP_PROC_FS
-        bool
-        depends on ACPI_SLEEP && PROC_FS
-        default y
-
-config ACPI_SLEEP_PROC_SLEEP
-        bool "/proc/acpi/sleep (deprecated)"
-        depends on ACPI_SLEEP_PROC_FS
-        default n
-        ---help---
-          Create /proc/acpi/sleep
-          Deprecated by /sys/power/state
-
 config ACPI_PROCFS
         bool "Deprecated /proc/acpi files"
         depends on PROC_FS
@@ -84,6 +71,7 @@ config ACPI_PROCFS
           they have been replaced by functions in /sys.
           The deprecated files (and their replacements) include:
 
+          /proc/acpi/sleep (/sys/power/state)
           /proc/acpi/info (/sys/modules/acpi/parameters/acpica_version)
           /proc/acpi/dsdt (/sys/firmware/acpi/tables/DSDT)
           /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)