diff options
| author | Jouk <joukj@tarantella.nano.tudelft.nl> | 2007-10-02 15:17:23 +0200 |
|---|---|---|
| committer | Jouk <joukj@tarantella.nano.tudelft.nl> | 2007-10-02 15:17:23 +0200 |
| commit | 584b84256b07e106cd7295495355eb21226465d7 (patch) | |
| tree | 028d47d265d01f3f96787792fbd41d495d60856c /src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c | |
| parent | eb9a5b6d5127858b01ec12672c999e7d25cd7aed (diff) | |
| parent | de1d725f442caa4d8ecbac3256b5a33d1f4a1257 (diff) | |
Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c index fc14060c04..be6455a01e 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c @@ -2,11 +2,11 @@ #include "enums.h" #include "nouveau_bufferobj.h" -#include "nouveau_buffers.h" #include "nouveau_context.h" #include "nouveau_drm.h" -#include "nouveau_object.h" +#include "nouveau_mem.h" #include "nouveau_msg.h" +#include "nouveau_object.h" #define NOUVEAU_MEM_FREE(mem) do { \ nouveau_mem_free(ctx, (mem)); \ |