diff options
Diffstat (limited to 'i915_317.patch')
| -rw-r--r-- | i915_317.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/i915_317.patch b/i915_317.patch index 4dcec700c1b0..e13bb3670d78 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 |