diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 05:11:11 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 05:11:11 +1100 |
| commit | 7e4bb6099a492b90374565aa574ba65f19ae2ab2 (patch) | |
| tree | 934b0efd833dd3e794ecdb5774f6a66a820837fa /linux-core | |
| parent | eb5487b9ca1d7ce60d5ddc784089d91cf176f439 (diff) | |
Revert "nouveau: stub superioctl"
This reverts commit 2370ded79b4176d76cda1ec5f495fd33c2d566ed.
Err.. didn't mean for that to slip in :)
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/Makefile.kernel | 2 | ||||
| -rw-r--r-- | linux-core/nouveau_buffer.c (renamed from linux-core/nouveau_bo.c) | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index 92e1eb7e..e7c280d0 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -23,7 +23,7 @@ i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o \ i915_buffer.o i915_compat.o nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \ nouveau_object.o nouveau_irq.o nouveau_notifier.o nouveau_swmthd.o \ - nouveau_sgdma.o nouveau_dma.o nouveau_bo.o nouveau_fence.o \ + nouveau_sgdma.o nouveau_dma.o nouveau_buffer.o nouveau_fence.o \ nv04_timer.o \ nv04_mc.o nv40_mc.o nv50_mc.o \ nv04_fb.o nv10_fb.o nv40_fb.o \ diff --git a/linux-core/nouveau_bo.c b/linux-core/nouveau_buffer.c index f0b0576c..c40dff6b 100644 --- a/linux-core/nouveau_bo.c +++ b/linux-core/nouveau_buffer.c @@ -254,12 +254,3 @@ struct drm_bo_driver nouveau_bo_driver = { .move = nouveau_bo_move, .ttm_cache_flush= nouveau_bo_flush_ttm }; - -int -nouveau_bo_validate(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - DRM_ERROR("unimplemented\n"); - return -EINVAL; -} - |