diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
| commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
| tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /drivers/gpu/drm/nouveau/nv04_instmem.c | |
| parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
| parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) | |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_instmem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_instmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c index a20c206625a2..a3b9563a6f60 100644 --- a/drivers/gpu/drm/nouveau/nv04_instmem.c +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c | |||
| @@ -30,7 +30,7 @@ nv04_instmem_determine_amount(struct drm_device *dev) | |||
| 30 | * of vram. For now, only reserve a small piece until we know | 30 | * of vram. For now, only reserve a small piece until we know |
| 31 | * more about what each chipset requires. | 31 | * more about what each chipset requires. |
| 32 | */ | 32 | */ |
| 33 | switch (dev_priv->chipset & 0xf0) { | 33 | switch (dev_priv->chipset) { |
| 34 | case 0x40: | 34 | case 0x40: |
| 35 | case 0x47: | 35 | case 0x47: |
| 36 | case 0x49: | 36 | case 0x49: |