diff options
| author | Keith Packard <keithp@keithp.com> | 2009-06-10 19:08:16 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-06-18 14:59:11 -0700 |
| commit | b99e228d354cc1e7f19fb8b5f1297d493e309186 (patch) | |
| tree | 0fc4c0cf7135514f8642237317d8a978815c5317 /drivers | |
| parent | 98acd46f356e560c371c0e416d92e8e56be31804 (diff) | |
| download | op-kernel-dev-b99e228d354cc1e7f19fb8b5f1297d493e309186.zip op-kernel-dev-b99e228d354cc1e7f19fb8b5f1297d493e309186.tar.gz | |
drm/i915: check for CONFIG_PNP before using pnp function
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_tiling.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index 5c1ceec..daeae62 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -114,11 +114,13 @@ intel_alloc_mchbar_resource(struct drm_device *dev) mchbar_addr = ((u64)temp_hi << 32) | temp_lo; /* If ACPI doesn't have it, assume we need to allocate it ourselves */ +#ifdef CONFIG_PNP if (mchbar_addr && pnp_range_reserved(mchbar_addr, mchbar_addr + MCHBAR_SIZE)) { ret = 0; goto out_put; } +#endif /* Get some space for it */ ret = pci_bus_alloc_resource(bridge_dev->bus, &dev_priv->mch_res, |
