Subject: [PATCH] [acpi legacy] Mark video driver as "legacy" - Update legacy Kconfig and Makefile Signed-off-by: Patrick Mochel --- drivers/acpi/drivers/legacy/Kconfig | 6 +++--- drivers/acpi/drivers/legacy/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) applies-to: 5f129493d6b1955abc5fc39c5dba51816a3e7897 051e4e7c2e6088de26e0261a11d1baf956fac151 diff --git a/drivers/acpi/drivers/legacy/Kconfig b/drivers/acpi/drivers/legacy/Kconfig index c1a53f6..3ecb570 100644 --- a/drivers/acpi/drivers/legacy/Kconfig +++ b/drivers/acpi/drivers/legacy/Kconfig @@ -147,9 +147,9 @@ config ACPI_LEGACY_THERMAL may be damaged without it. -config ACPI_VIDEO - tristate "Video" - depends on X86 +config ACPI_LEGACY_VIDEO + tristate "Video (Legacy Driver)" + depends on ACPI_DM_LEGACY && !(ACPI_VIDEO=y || ACPI_VIDEO=m) && X86 default y help This driver implement the ACPI Extensions For Display Adapters diff --git a/drivers/acpi/drivers/legacy/Makefile b/drivers/acpi/drivers/legacy/Makefile index 179adf3..62c20bb 100644 --- a/drivers/acpi/drivers/legacy/Makefile +++ b/drivers/acpi/drivers/legacy/Makefile @@ -25,7 +25,7 @@ endif obj-$(CONFIG_ACPI_PROCESSOR) += processor.o obj-$(CONFIG_ACPI_LEGACY_THERMAL) += thermal.o -obj-$(CONFIG_ACPI_VIDEO) += video.o +obj-$(CONFIG_ACPI_LEGACY_VIDEO) += video.o obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o obj-$(CONFIG_ACPI_IBM) += ibm_acpi.o --- 0.99.9.GIT