diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-18 23:35:24 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-18 23:35:24 +0000 |
| commit | 2b4f0175799a5d714ff7f83bba7eae6fca268834 (patch) | |
| tree | ec715b6a6526bdc8e8ae71c677d047f5de5da991 /drivers/gpu/drm/nouveau/nouveau_bios.h | |
| parent | b857df1acc634b18db1db2a40864af985100266e (diff) | |
| parent | 083c88fcf1a89986ffa160826f96509fb4b370bb (diff) | |
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index 68446fd4146..fd94bd6dc26 100644 --- 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; - spinlock_t lock; + struct mutex lock; uint8_t data[NV_PROM_SIZE]; unsigned int length; |