diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-12-21 06:30:39 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-21 06:30:39 +1000 |
commit | e52ebd6e8587e2e37ed65ad9fc9035c2bd00b563 (patch) | |
tree | 8dc271c2fdc6ceda6b329762d234c88e0fdffe2e /src/mesa/drivers/dri/nouveau/nouveau_driver.h | |
parent | 9f2cf899578464a7448d7abec681bde42eb3d2f2 (diff) | |
parent | 5c102dd94f435e97507213fbd128e50dd15f5f54 (diff) |
Merge remote branch 'origin/master' into nvc0-new
Conflicts:
src/gallium/drivers/nouveau/nouveau_winsys.h
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_driver.h')
-rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h index 8036b18edc..c5ac1282d0 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h +++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h @@ -38,7 +38,6 @@ #include <assert.h> #include "nouveau_device.h" -#include "nouveau_pushbuf.h" #include "nouveau_grobj.h" #include "nouveau_channel.h" #include "nouveau_bo.h" @@ -46,6 +45,7 @@ #include "nouveau_screen.h" #include "nouveau_state.h" #include "nouveau_surface.h" +#include "nv04_pushbuf.h" #define DRIVER_DATE "20091015" #define DRIVER_AUTHOR "Nouveau" |