diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-24 20:08:26 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-24 20:08:26 (GMT) |
commit | db8862eafe8a5d030a3b02e81b8bb47447c315e3 (patch) | |
tree | 073ea7b46809bf804134cbf008a593413c02a99c /drivers/gpu/drm/i915/i915_drv.h | |
parent | c5dee6177f4bd2095aab7d9be9f6ebdddd6deee9 (diff) | |
parent | c20137fc5329eaf24093fc48c52608dc66be8e5c (diff) | |
download | linux-fsl-qoriq-db8862eafe8a5d030a3b02e81b8bb47447c315e3.tar.xz |
Merge branch 'linus' into tracing/hw-branch-tracing
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index adc972c..b3cc473 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -106,6 +106,8 @@ struct intel_opregion { typedef struct drm_i915_private { struct drm_device *dev; + int has_gem; + void __iomem *regs; drm_local_map_t *sarea; |