From 89406efa946095dfbceaf09be243c63d6ed7a2f7 Mon Sep 17 00:00:00 2001
From: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Date: Sun, 23 Jan 2011 18:17:17 +0000
Subject: [PATCH] --- yaml --- r: 232340 b: refs/heads/master c:
 b705120e4198315f4ae043de06c62f65e0851fd3 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/gpu/drm/i915/intel_opregion.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 548ed66f9a40..5846e48e2ec2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a327f23e23fa509e6e3c2263ae1cc0a67dec387
+refs/heads/master: b705120e4198315f4ae043de06c62f65e0851fd3
diff --git a/trunk/drivers/gpu/drm/i915/intel_opregion.c b/trunk/drivers/gpu/drm/i915/intel_opregion.c
index f295a7aaadf9..64fd64443ca6 100644
--- a/trunk/drivers/gpu/drm/i915/intel_opregion.c
+++ b/trunk/drivers/gpu/drm/i915/intel_opregion.c
@@ -26,6 +26,7 @@
  */
 
 #include <linux/acpi.h>
+#include <linux/acpi_io.h>
 #include <acpi/video.h>
 
 #include "drmP.h"
@@ -476,7 +477,7 @@ int intel_opregion_setup(struct drm_device *dev)
 		return -ENOTSUPP;
 	}
 
-	base = ioremap(asls, OPREGION_SIZE);
+	base = acpi_os_ioremap(asls, OPREGION_SIZE);
 	if (!base)
 		return -ENOMEM;