---

yaml --- r: 307120 b: refs/heads/master c: 3fdcf43 h: refs/heads/master v: v3
git-mirror · Apr 12, 2012 · 5a5b23d · 5a5b23d
1 parent f8b47ad
commit 5a5b23d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2911a35b2e4eb87ec48d03aeb11f019e51ae3c0d
+refs/heads/master: 3fdcf43192559f53305644d0c1e0f7dda398f091
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -9522,7 +9522,7 @@ static void i915_disable_vga(struct drm_device *dev)
 		vga_reg = VGACNTRL;
 
 	vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO);
-	outb(1, VGA_SR_INDEX);
+	outb(SR01, VGA_SR_INDEX);
 	sr1 = inb(VGA_SR_DATA);
 	outb(sr1 | 1<<5, VGA_SR_DATA);
 	vga_put(dev->pdev, VGA_RSRC_LEGACY_IO);