1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 88681aca88c5..0f9de2b44c0c 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -66,7 +66,6 @@ config ACPI_PROCFS
 config ACPI_PROCFS_POWER
         bool "Deprecated power /proc/acpi directories"
         depends on PROC_FS
-        default y
         help
           For backwards compatibility, this option allows
           deprecated power /proc/acpi/ directories to exist, even when
@@ -90,13 +89,6 @@ config ACPI_POWER_METER
           To compile this driver as a module, choose M here:
           the module will be called power-meter.
 
-config ACPI_SYSFS_POWER
-        bool "Future power /sys interface"
-        select POWER_SUPPLY
-        default y
-        help
-          Say N to disable power /sys interface
-
 config ACPI_EC_DEBUGFS
         tristate "EC read/write access through /sys/kernel/debug/ec"
         default n
@@ -136,6 +128,7 @@ config ACPI_PROC_EVENT
 config ACPI_AC
         tristate "AC Adapter"
         depends on X86
+        select POWER_SUPPLY
         default y
         help
           This driver supports the AC Adapter object, which indicates
@@ -148,6 +141,7 @@ config ACPI_AC
 config ACPI_BATTERY
         tristate "Battery"
         depends on X86
+        select POWER_SUPPLY
         default y
         help
           This driver adds support for battery information through
@@ -364,6 +358,7 @@ config ACPI_HOTPLUG_MEMORY
 config ACPI_SBS
         tristate "Smart Battery System"
         depends on X86
+        select POWER_SUPPLY
         help
           This driver supports the Smart Battery System, another
           type of access to battery information, found on some laptops.