diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/olpc_dcon/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig index f1082f50fdc..b0530676687 100644 --- a/drivers/staging/olpc_dcon/Kconfig +++ b/drivers/staging/olpc_dcon/Kconfig @@ -9,7 +9,7 @@ config FB_OLPC_DCON config FB_OLPC_DCON_1 bool "OLPC XO-1 DCON support" - depends on FB_OLPC_DCON + depends on FB_OLPC_DCON && GPIO_CS5535 default y ---help--- Enable support for the DCON in XO-1 model laptops. The kernel diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c index e213b63f811..7aa9b1a45bd 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c +++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c @@ -7,6 +7,7 @@ */ #include <linux/acpi.h> +#include <linux/delay.h> #include <linux/pci.h> #include <linux/gpio.h> #include <asm/olpc.h> |