aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-03-17 15:46:44 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-20 02:35:36 +0100
commit9f380fc56ae1175781b67cea4bca1a2b183f9382 (patch)
tree7d2e7b75e6380f1d1e3dd1fc95fa49f1c7781872 /drivers/acpi
parentLinux 3.14-rc7 (diff)
downloadlinux-dev-9f380fc56ae1175781b67cea4bca1a2b183f9382.tar.xz
linux-dev-9f380fc56ae1175781b67cea4bca1a2b183f9382.zip
ACPI / video: fix ACPI_VIDEO dependencies
ACPI_VIDEO stopped depending on VIDEO_OUTPUT_CONTROL over 3 years ago (see commit 677bd810, "ACPI video: remove output switching control".) So it's about time to remove the Kconfig dependency between these two options. Signed-off-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 4770de5707b9..19520221f41b 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -115,7 +115,7 @@ config ACPI_BUTTON
config ACPI_VIDEO
tristate "Video"
- depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
+ depends on X86 && BACKLIGHT_CLASS_DEVICE
depends on INPUT
select THERMAL
help