diff options
| author | Christian König <[email protected]> | 2010-12-22 21:12:24 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-12-22 21:12:24 +0100 |
| commit | e179a8bf34022c200deee92d328cb1bae3c3aa4a (patch) | |
| tree | 4c67616380e7c0efa2d7ff0fe67fd18af2fa11ad /src/gallium/drivers/nvfx/nv04_2d.c | |
| parent | 1b03996b1269fb8b2f89e0a013d8427da660ff83 (diff) | |
| parent | 38c8b034e2775640c588711290c244632dcc2475 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/gallium/drivers/nvfx/nv04_2d.c')
| -rw-r--r-- | src/gallium/drivers/nvfx/nv04_2d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c index e0e65e7a87f..e2fadd33e1c 100644 --- a/src/gallium/drivers/nvfx/nv04_2d.c +++ b/src/gallium/drivers/nvfx/nv04_2d.c @@ -34,11 +34,11 @@ #include <stdio.h> #include <stdint.h> #include <nouveau/nouveau_device.h> -#include <nouveau/nouveau_pushbuf.h> #include <nouveau/nouveau_channel.h> #include <nouveau/nouveau_bo.h> #include <nouveau/nouveau_notifier.h> #include <nouveau/nouveau_grobj.h> +#include <nouveau/nv04_pushbuf.h> #include "nv04_2d.h" #include "nouveau/nv_object.xml.h" |