drm/nouveau: fix earlier mistake when fixing merge conflict
authorBen Skeggs <bskeggs@redhat.com>
Tue, 17 Aug 2010 02:02:43 +0000 (12:02 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 17 Aug 2010 02:02:43 +0000 (12:02 +1000)
commit625db6b7e34580b750a13fd36a211a4366f6c3e2
tree68ad1ead3c606c22bd872d22eec861dc3eb4e9de
parentb515f3a2d8f8543aa189ac8d10195f923b64245b
drm/nouveau: fix earlier mistake when fixing merge conflict

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_bios.c