diff options
author | Kristian Høgsberg <krh@redhat.com> | 2008-07-07 15:43:43 -0400 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2008-07-07 15:43:43 -0400 |
commit | 3e02f7fd310ae062d250d8db01ddc3b7de3d7943 (patch) | |
tree | cfce44b02b989ad9d7bf2a497e49743e15d77168 /linux-core/i915_drv.c | |
parent | 7fd8a5de63781f6faa053509c80e02e8f1cdbb69 (diff) | |
parent | d250a55fc6a726a8bfaf4f871eeb09c895a9ba51 (diff) |
Merge commit 'origin/drm-gem' into ms-gem
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_stub.c
linux-core/i915_drv.c
linux-core/i915_gem.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/i915_drv.c')
-rw-r--r-- | linux-core/i915_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c index 2b8ee774..33a33e61 100644 --- a/linux-core/i915_drv.c +++ b/linux-core/i915_drv.c @@ -600,6 +600,8 @@ static struct drm_driver driver = { .get_reg_ofs = drm_core_get_reg_ofs, .master_create = i915_master_create, .master_destroy = i915_master_destroy, + .proc_init = i915_gem_proc_init, + .proc_cleanup = i915_gem_proc_cleanup, .ioctls = i915_ioctls, .gem_init_object = i915_gem_init_object, .gem_free_object = i915_gem_free_object, |