diff --git a/[refs] b/[refs] index ab313eee53be..482bc2bb85f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc34f6c617bf2a845d793af12b96bcc0afd472c4 +refs/heads/master: 128a2bcf9dddeb8e79a4ba55bf191533f70f39ce diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig index 934d639b3684..f1372de4ce79 100644 --- a/trunk/drivers/acpi/Kconfig +++ b/trunk/drivers/acpi/Kconfig @@ -68,14 +68,6 @@ config ACPI_PROCFS Say N to delete /proc/acpi/ files that have moved to /sys/ -config ACPI_PROCFS_SLEEP - bool "/proc/acpi/sleep (deprecated)" - depends on PM_SLEEP && ACPI_PROCFS - default n - ---help--- - Create /proc/acpi/sleep - Deprecated by /sys/power/state - config ACPI_AC tristate "AC Adapter" depends on X86