aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-03-17 10:46:44 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-19 21:35:36 -0400
commit9f380fc56ae1175781b67cea4bca1a2b183f9382 (patch)
tree7d2e7b75e6380f1d1e3dd1fc95fa49f1c7781872
parentdcb99fd9b08cfe1afe426af4d8d3cbc429190f15 (diff)
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>
-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
115 115
116config ACPI_VIDEO 116config ACPI_VIDEO
117 tristate "Video" 117 tristate "Video"
118 depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL 118 depends on X86 && BACKLIGHT_CLASS_DEVICE
119 depends on INPUT 119 depends on INPUT
120 select THERMAL 120 select THERMAL
121 help 121 help