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/gallium/drivers/nouveau | |
| 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/gallium/drivers/nouveau')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_winsys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h index e7acbe6c3d..8dfb84a596 100644 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h @@ -11,7 +11,7 @@ #include "nouveau/nouveau_notifier.h" #include "nouveau/nouveau_resource.h" #ifndef NOUVEAU_NVC0 -#include "nouveau/nouveau_pushbuf.h" +#include "nouveau/nv04_pushbuf.h" #endif #ifndef NV04_PFIFO_MAX_PACKET_LEN |