diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2011-04-03 12:05:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-04 21:37:04 -0700 |
| commit | bed4ab7781e8600a7ebf4378a1b3f26d31517f57 (patch) | |
| tree | 94270222c838e43aed2d495f90656ec3dd592064 /drivers/staging | |
| parent | 392a002a0066812480e1b55639bbced5936d26aa (diff) | |
| download | linux-bed4ab7781e8600a7ebf4378a1b3f26d31517f57.tar.gz linux-bed4ab7781e8600a7ebf4378a1b3f26d31517f57.tar.bz2 linux-bed4ab7781e8600a7ebf4378a1b3f26d31517f57.zip | |
staging: fix olpc_dcon build errors
drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c: In function ‘dcon_wiggle_xo_1_5’:
drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c:155: error: implicit declaration of function ‘udelay’
drivers/built-in.o: In function `dcon_read_status_xo_1':
olpc_dcon_xo_1.c:(.text+0x13472e): undefined reference to `cs5535_gpio_set'
Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -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 f1082f50fdce..b05306766870 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 e213b63f8116..7aa9b1a45bd6 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> |