projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
olpc_dcon
/
olpc_dcon_xo_1.c
diff --git
a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
index b5d21f6497f9ef14aa4176550615a6203c6a11c8..22c04eabed4116768959b10681c4c880c0940c7c 100644
(file)
--- a/
drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+++ b/
drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
@@
-12,6
+12,7
@@
*/
#include <linux/cs5535.h>
#include <linux/gpio.h>
+#include <linux/delay.h>
#include <asm/olpc.h>
#include "olpc_dcon.h"