From 009af5728438f9666167b16643ed91e47e671581 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 21 Feb 2011 14:39:08 -0800 Subject: [PATCH] --- yaml --- r: 236121 b: refs/heads/master c: 6a3a81e7ca9b1ddaaf8d644b4102aff0fe2a7c40 h: refs/heads/master i: 236119: 4de2c18f4e05b576d24b4d9569125c5db09a3245 v: v3 --- [refs] | 2 +- trunk/drivers/staging/olpc_dcon/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1f4d44c6a62e..df9c0c62e0dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87be424a9a4be41df26b25b3360969211cedd5d1 +refs/heads/master: 6a3a81e7ca9b1ddaaf8d644b4102aff0fe2a7c40 diff --git a/trunk/drivers/staging/olpc_dcon/Kconfig b/trunk/drivers/staging/olpc_dcon/Kconfig index acb0a79a949a..f1082f50fdce 100644 --- a/trunk/drivers/staging/olpc_dcon/Kconfig +++ b/trunk/drivers/staging/olpc_dcon/Kconfig @@ -1,6 +1,6 @@ config FB_OLPC_DCON tristate "One Laptop Per Child Display CONtroller support" - depends on OLPC + depends on OLPC && FB select I2C ---help--- Add support for the OLPC XO DCON controller. This controller is @@ -19,7 +19,7 @@ config FB_OLPC_DCON_1 config FB_OLPC_DCON_1_5 bool "OLPC XO-1.5 DCON support" - depends on FB_OLPC_DCON + depends on FB_OLPC_DCON && ACPI default y ---help--- Enable support for the DCON in XO-1.5 model laptops. The kernel