From: Jerry Lin <wahahab11@gmail.com>
Date: Wed, 25 Sep 2019 07:42:43 +0000 (+0800)
Subject: staging: olpc_dcon: fix wrong dependencies in Kconfig file
X-Git-Tag: Ubuntu-5.10.0-12.13~4064^2~384
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=01b16aed578a0302672e7a4c2a778fef2472b29e;p=mirror_ubuntu-hirsute-kernel.git

staging: olpc_dcon: fix wrong dependencies in Kconfig file

To allow simultaneous support for XO-1 and XO-1.5.
This module require GPIO_CS5535 (for 1.0) and ACPI (for 1.5) now.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Jerry Lin <wahahab11@gmail.com>
Link: https://lore.kernel.org/r/20190925074243.GA24947@compute1
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig
index 4ae271ff2baf..d1a0dea09ef0 100644
--- a/drivers/staging/olpc_dcon/Kconfig
+++ b/drivers/staging/olpc_dcon/Kconfig
@@ -3,7 +3,7 @@ config FB_OLPC_DCON
 	tristate "One Laptop Per Child Display CONtroller support"
 	depends on OLPC && FB
 	depends on I2C
-	depends on (GPIO_CS5535 || ACPI)
+	depends on GPIO_CS5535 && ACPI
 	select BACKLIGHT_CLASS_DEVICE
 	help
 	  In order to support very low power operation, the XO laptop uses a