projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm/panel/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux into...
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
core
/
include
/
subdev
/
timer.h
diff --git
a/drivers/gpu/drm/nouveau/core/include/subdev/timer.h
b/drivers/gpu/drm/nouveau/core/include/subdev/timer.h
index
9ab70df
..
db9be80
100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/include/subdev/timer.h
+++ b/
drivers/gpu/drm/nouveau/core/include/subdev/timer.h
@@
-59,5
+59,6
@@
int nouveau_timer_create_(struct nouveau_object *, struct nouveau_engine *,
struct nouveau_oclass *, int size, void **);
extern struct nouveau_oclass nv04_timer_oclass;
+extern struct nouveau_oclass gk20a_timer_oclass;
#endif