git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'korg/drm-core-next' into drm-next-stage
[safe/jmp/linux-2.6]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_bios.h
diff --git
a/drivers/gpu/drm/nouveau/nouveau_bios.h
b/drivers/gpu/drm/nouveau/nouveau_bios.h
index
68446fd
..
fd94bd6
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/
drivers/gpu/drm/nouveau/nouveau_bios.h
@@
-205,7
+205,7
@@
struct nvbios {
struct drm_device *dev;
struct nouveau_bios_info pub;
- s
pinlock_t
lock;
+ s
truct mutex
lock;
uint8_t data[NV_PROM_SIZE];
unsigned int length;