aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/olpc_dcon
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2011-02-21 14:39:08 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-23 14:39:10 -0800
commit6a3a81e7ca9b1ddaaf8d644b4102aff0fe2a7c40 (patch)
tree1c6e57a2c4b457d673258182c617d4b537e0a32d /drivers/staging/olpc_dcon
parent87be424a9a4be41df26b25b3360969211cedd5d1 (diff)
staging: fix olpc_dcon kconfig and build errors
drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c:106: error: 'acpi_gbl_FADT' undeclared (first use in this function) Fixing that one gives: ERROR: "backlight_device_register" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! ERROR: "registered_fb" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! ERROR: "lock_fb_info" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! ERROR: "backlight_device_unregister" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! ERROR: "num_registered_fb" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! ERROR: "fb_blank" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Chris Ball <cjb@laptop.org> Cc: Jon Nettleton <jon.nettleton@gmail.com> Acked-By: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/olpc_dcon')
-rw-r--r--drivers/staging/olpc_dcon/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig
index acb0a79a949..f1082f50fdc 100644
--- a/drivers/staging/olpc_dcon/Kconfig
+++ b/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