Subject: [PATCH] [acpi battery] Mark old-school driver as "legacy" - Update Kconfig and Makefile in drivers/acpi/driver/legacy/ Signed-off-by: Patrick Mochel --- drivers/acpi/drivers/legacy/Kconfig | 8 ++++---- drivers/acpi/drivers/legacy/Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) applies-to: 3e6d37dc9cb58945f15674281ffab148ef42218c 15f6f923ccb7e9c1adf4655a8ca26f69c30402ff diff --git a/drivers/acpi/drivers/legacy/Kconfig b/drivers/acpi/drivers/legacy/Kconfig index aee700e..d9756ee 100644 --- a/drivers/acpi/drivers/legacy/Kconfig +++ b/drivers/acpi/drivers/legacy/Kconfig @@ -21,10 +21,10 @@ config ACPI_LEGACY_AC switch between A/C and battery, say Y. -config ACPI_BATTERY - tristate "Battery" - depends on X86 - default y +config ACPI_LEGACY_BATTERY + tristate "Battery (Legacy Driver)" + depends on ACPI_DM_LEGACY && !(ACPI_BATTERY=y || ACPI_BATTERY=m) && X86 + default m help This driver adds support for battery information through /proc/acpi/battery. If you have a mobile system with a battery, diff --git a/drivers/acpi/drivers/legacy/Makefile b/drivers/acpi/drivers/legacy/Makefile index 94e6260..01a4f1d 100644 --- a/drivers/acpi/drivers/legacy/Makefile +++ b/drivers/acpi/drivers/legacy/Makefile @@ -1,7 +1,7 @@ obj-$(CONFIG_ACPI_LEGACY_AC) += ac.o -obj-$(CONFIG_ACPI_BATTERY) += battery.o +obj-$(CONFIG_ACPI_LEGACY_BATTERY) += battery.o obj-$(CONFIG_ACPI_BUTTON) += button.o obj-$(CONFIG_ACPI_CONTAINER) += container.o obj-$(CONFIG_ACPI_EC) += ec.o --- 0.99.9.GIT