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 branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
olpc_dcon
/
olpc_dcon.h
diff --git
a/drivers/staging/olpc_dcon/olpc_dcon.h
b/drivers/staging/olpc_dcon/olpc_dcon.h
index d06e19db1b80c242a97c7ba71a4cb5dec745e37c..215e7ec4dea237b3c6452efe2f3b957fb99507ab 100644
(file)
--- a/
drivers/staging/olpc_dcon/olpc_dcon.h
+++ b/
drivers/staging/olpc_dcon/olpc_dcon.h
@@
-79,8
+79,8
@@
struct dcon_priv {
/* Variables used during switches */
bool switched;
-
struct timespec
irq_time;
-
struct timespec
load_time;
+
ktime_t
irq_time;
+
ktime_t
load_time;
/* Current output type; true == mono, false == color */
bool mono;