From 02b09d271c60d13fbb738c7053429a3b816397db Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 30 Jul 2008 16:26:51 +1000
Subject: i915: add version checks for opregion on old kernels

---
 linux-core/i915_opregion.c | 2 ++
 shared-core/i915_dma.c     | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/linux-core/i915_opregion.c b/linux-core/i915_opregion.c
index e691571a..fdd4987e 100644
--- a/linux-core/i915_opregion.c
+++ b/linux-core/i915_opregion.c
@@ -32,6 +32,7 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
 #define PCI_ASLE 0xe4
 #define PCI_ASLS 0xfc
 
@@ -384,3 +385,4 @@ void intel_opregion_free(struct drm_device *dev)
 	
 	opregion->enabled = 0;
 }
+#endif
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index e57580fe..47f1f463 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -1038,7 +1038,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
 	intel_init_chipset_flush_compat(dev);
 #endif
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
 	intel_opregion_init(dev);
+#endif
 #endif
 
 	I915_WRITE16(HWSTAM, 0xeffe);
@@ -1097,7 +1099,9 @@ int i915_driver_unload(struct drm_device *dev)
 		drm_rmmap(dev, dev_priv->mmio_map);
 
 #ifdef __linux__
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
 	intel_opregion_free(dev);
+#endif
 #endif
 
 	drm_free(dev->dev_private, sizeof(drm_i915_private_t),
-- 
cgit v1.2.3