From 3f524d20262d3277f17c1a82cb079a9c21d97608 Mon Sep 17 00:00:00 2001
From: Dan Ziemba <zman0900@gmail.com>
Date: Sat, 18 Jul 2015 00:49:26 -0400
Subject: [PATCH] Fixed i915 vga arbitration patch

Change to vgaarb.h was merged upstream.  See
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit?id=0ea18b40cdd382a8a338d02e06c4646c35bd753b
---
 PKGBUILD       |  2 +-
 i915_317.patch | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 52f0acc..62dff94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,7 +38,7 @@ sha256sums=('caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f'
             '959c4d71b5dc50434eeecf3a8608758f57f111c6e999289c435b13fc8c6be5f0'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149'
-            'f86ce528b63f198b84c4d8d92d35329aa4000d462217dc2db03bac5eb693cf19')
+            '65faab45248008810b0a5f27162101a34dfe298c14d3506e52236c680353d7f8')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
diff --git a/i915_317.patch b/i915_317.patch
index 4dcec70..e13bb36 100644
--- a/i915_317.patch
+++ b/i915_317.patch
@@ -135,22 +135,3 @@ diff -rupN linux-3.17.old/drivers/gpu/drm/i915/intel_drv.h linux-3.17/drivers/gp
 +extern void i915_disable_vga_mem(struct drm_device *dev);
 +
  #endif /* __INTEL_DRV_H__ */
-diff -rupN linux-3.17.old/include/linux/vgaarb.h linux-3.17/include/linux/vgaarb.h
---- linux-3.17.old/include/linux/vgaarb.h	2014-10-05 17:23:04.000000000 -0200
-+++ linux-3.17/include/linux/vgaarb.h	2014-10-08 13:25:35.426920046 -0200
-@@ -65,8 +65,15 @@ struct pci_dev;
-  *     out of the arbitration process (and can be safe to take
-  *     interrupts at any time.
-  */
-+#if defined(CONFIG_VGA_ARB)
- extern void vga_set_legacy_decoding(struct pci_dev *pdev,
- 				    unsigned int decodes);
-+#else
-+static inline void vga_set_legacy_decoding(struct pci_dev *pdev,
-+					   unsigned int decodes)
-+{
-+}
-+#endif
- 
- /**
-  *     vga_get         - acquire & locks VGA resources