projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-intel-next-fixes-2016-07-25' of git://anongit.freedesktop.org/drm...
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nvkm
/
subdev
/
mc
/
g84.c
diff --git
a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c
index 5c85b47f071d3a81645a5e3a24cfed5dd667947f..c3d66ef5dc129877607cbbbce62f02b39054cbf7 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c
+++ b/
drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c
@@
-57,7
+57,7
@@
g84_mc = {
.intr = g84_mc_intr,
.intr_unarm = nv04_mc_intr_unarm,
.intr_rearm = nv04_mc_intr_rearm,
- .intr_
mask = nv04_mc_intr_mask
,
+ .intr_
stat = nv04_mc_intr_stat
,
.reset = g84_mc_reset,
};