git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_gem.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_gem.c
b/drivers/gpu/drm/nouveau/nouveau_gem.c
index
e8b04f4
..
b52e460
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_gem.c
@@
-97,7
+97,7
@@
nouveau_gem_new(struct drm_device *dev, struct nouveau_channel *chan,
return -ENOMEM;
}
- nvbo->bo.persist
a
nt_swap_storage = nvbo->gem->filp;
+ nvbo->bo.persist
e
nt_swap_storage = nvbo->gem->filp;
nvbo->gem->driver_private = nvbo;
return 0;
}