diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 10:13:14 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 10:13:14 +0100 |
| commit | b970be7c4114173e733309eec092a0269e1e6a61 (patch) | |
| tree | 94b1c201d6330186ee5831d149818143cf9216e3 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | c3add4b63438555d5e88c5893d238ab80d1f5959 (diff) | |
| parent | cbc60ca04b342a4e1f2a1086a7277c077f07dbed (diff) | |
| download | blackbird-op-linux-b970be7c4114173e733309eec092a0269e1e6a61.tar.gz blackbird-op-linux-b970be7c4114173e733309eec092a0269e1e6a61.zip | |
Merge remote branch 'airlied/drm-core-next' into HEAD
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 216deb579785..ba75255ec450 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -523,8 +523,6 @@ static struct drm_driver driver = { .irq_uninstall = i915_driver_irq_uninstall, .irq_handler = i915_driver_irq_handler, .reclaim_buffers = drm_core_reclaim_buffers, - .get_map_ofs = drm_core_get_map_ofs, - .get_reg_ofs = drm_core_get_reg_ofs, .master_create = i915_master_create, .master_destroy = i915_master_destroy, #if defined(CONFIG_DEBUG_FS) |
