From cef32a5c0eaef2f9e617626f32152e2c7bfd79b8 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 23 Oct 2006 14:25:30 -0700
Subject: [PATCH] --- yaml --- r: 40218 b: refs/heads/master c:
 0c0e4668e0e65dd1404e8cf066d147235f95561d h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/pci/quirks.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e1ba8d607495..35000b908af5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04fed361dadb7921507a470947ac23d2f26352cf
+refs/heads/master: 0c0e4668e0e65dd1404e8cf066d147235f95561d
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
index ecf8e4d6b9da..e8a7f1b1b2bc 100644
--- a/trunk/drivers/pci/quirks.c
+++ b/trunk/drivers/pci/quirks.c
@@ -1634,7 +1634,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1
  * is marked here since the boot video device will be the only enabled
  * video device at this point.
  */
-#if 0
+
 static void __devinit fixup_video(struct pci_dev *pdev)
 {
 	struct pci_dev *bridge;
@@ -1663,7 +1663,7 @@ static void __devinit fixup_video(struct pci_dev *pdev)
 	}
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, fixup_video);
-#endif
+
 
 static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
 {