diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-26 15:42:41 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-26 15:42:41 +0000 |
| commit | 1e66322633943bc27bf5e68609f564fa95e6e6a1 (patch) | |
| tree | 1a536a41c6d9818484c0a972d565fb4914943729 /shared-core/nouveau_fifo.c | |
| parent | 73cb02b5430b3881cbce5fb4852ac573c11ff831 (diff) | |
| parent | e87cec19687089f9f268ec0eb81b57e6fb8de6a9 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
Diffstat (limited to 'shared-core/nouveau_fifo.c')
| -rw-r--r-- | shared-core/nouveau_fifo.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c index 0daf9ac4..056cb6d0 100644 --- a/shared-core/nouveau_fifo.c +++ b/shared-core/nouveau_fifo.c @@ -45,11 +45,6 @@ int nouveau_fifo_ctx_size(struct drm_device *dev) * functions doing the actual work ***********************************/ -/* voir nv_xaa.c : NVResetGraphics - * mémoire mappée par nv_driver.c : NVMapMem - * voir nv_driver.c : NVPreInit - */ - static int nouveau_fifo_instmem_configure(struct drm_device *dev) { struct drm_nouveau_private *dev_priv = dev->dev_private; |