diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-11-11 00:56:37 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-11-18 14:39:04 +1000 |
| commit | c1b60ece91460214b5135360a375f3f6fbb59608 (patch) | |
| tree | 9ff05300d7e160dc0dc57a2f272e668a0536962f /drivers/gpu/drm/nouveau/nouveau_temp.c | |
| parent | 5bead799d3f8f1500c4b59301b8a2732a92f559f (diff) | |
| download | kernel_samsung_smdk4412-c1b60ece91460214b5135360a375f3f6fbb59608.zip kernel_samsung_smdk4412-c1b60ece91460214b5135360a375f3f6fbb59608.tar.gz kernel_samsung_smdk4412-c1b60ece91460214b5135360a375f3f6fbb59608.tar.bz2 | |
drm/nouveau: Fix a few confusions between "chipset" and "card_type".
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_temp.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_temp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c index 16bbbf1..7ecc4ad 100644 --- a/drivers/gpu/drm/nouveau/nouveau_temp.c +++ b/drivers/gpu/drm/nouveau/nouveau_temp.c @@ -191,7 +191,7 @@ nv40_temp_get(struct drm_device *dev) int offset = sensor->offset_mult / sensor->offset_div; int core_temp; - if (dev_priv->chipset >= 0x50) { + if (dev_priv->card_type >= NV_50) { core_temp = nv_rd32(dev, 0x20008); } else { core_temp = nv_rd32(dev, 0x0015b4) & 0x1fff; |