From 92dd6b36c8e1201a4416fddf8d23187c3b7a059e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 17 May 2012 08:31:29 +0100
Subject: [PATCH] --- yaml --- r: 307381 b: refs/heads/master c:
 db2e034d2c55e1f273ed820cc3edcdbc73d0292c h: refs/heads/master i:   307379:
 ffb7a9a92026b545a9cd189e678ef919cd19ddb0 v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/pci/fixup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e6278db21906..b8f89aa43a4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cf20beec4b91c240cf759b4db72669e251f1fc4
+refs/heads/master: db2e034d2c55e1f273ed820cc3edcdbc73d0292c
diff --git a/trunk/arch/x86/pci/fixup.c b/trunk/arch/x86/pci/fixup.c
index 01635537d72e..82487d3d5879 100644
--- a/trunk/arch/x86/pci/fixup.c
+++ b/trunk/arch/x86/pci/fixup.c
@@ -6,8 +6,8 @@
 #include <linux/dmi.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/vgaarb.h>
 #include <asm/pci_x86.h>
-#include <asm/vga.h>
 
 static void __devinit pci_fixup_i450nx(struct pci_dev *d)
 {