diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-05-11 10:29:41 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-11 16:35:46 (GMT) |
| commit | a373bedd7e70c1932f3f37d6858f437b69ef01c6 (patch) | |
| tree | 59c4532640d84a8da89c6cb8b95cfe67fb68e985 /drivers/gpu/drm/gma500/opregion.c | |
| parent | d3029b4e0358e8d3519a290d7e61686ad7e58830 (diff) | |
| download | linux-a373bedd7e70c1932f3f37d6858f437b69ef01c6.tar.xz | |
gma500: Fix build without ACPI
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/opregion.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/opregion.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/gma500/opregion.c b/drivers/gpu/drm/gma500/opregion.c index 05661bf..aa9e89f 100644 --- a/drivers/gpu/drm/gma500/opregion.c +++ b/drivers/gpu/drm/gma500/opregion.c @@ -21,10 +21,8 @@ * DEALINGS IN THE SOFTWARE. * */ -#ifdef CONFIG_ACPI #include <linux/acpi.h> #include <linux/acpi_io.h> -#endif #include "psb_drv.h" #include "psb_intel_reg.h" @@ -311,11 +309,7 @@ int psb_intel_opregion_setup(struct drm_device *dev) return -ENOTSUPP; } DRM_DEBUG("OpRegion detected at 0x%8x\n", opregion_phy); -#ifdef CONFIG_ACPI base = acpi_os_ioremap(opregion_phy, 8*1024); -#else - base = ioremap(opregion_phy, 8*1024); -#endif if (!base) return -ENOMEM; |