Skip to contentSkip to conversation

staging: olpc_dcon: fix wrong dependencies in Kconfig file

PATCH Superseded Jerry Lin 2 participants 2 messages Sep 25, 2019 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jerry Lin

author
#0 lore raw

PATCH 1/1 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.

---
 drivers/staging/olpc_dcon/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/olpc_dcon/Kconfig +1 -1
index 4ae271f..c2429e4 100644
@@ -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
Signature · 1 line
2.7.4
#1 lore raw
Quoted 14 lines · Jerry Lin

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.

---
 drivers/staging/olpc_dcon/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/olpc_dcon/Kconfig +0 -0
index 4ae271f..c2429e4 100644

drivers/staging/olpc_dcon/Kconfig config FB_OLPC_DCON · line 6

Quoted 5 lines
drivers/staging/olpc_dcon/Kconfig +1 -1
@@ -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)

Please, remove the parentheses as well.

regards,
dan carpenter