summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nouveau/nouveau_winsys.h
diff options
context:
space:
mode:
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>2011-03-04 11:02:10 +0100
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>2011-03-04 11:02:10 +0100
commitcf143c1f4d7c3636ddd5c767518b1b00ff46b16c (patch)
tree83a38a7ae4e9d2f7e65e8ad3ec3b7c35374bad68 /src/gallium/drivers/nouveau/nouveau_winsys.h
parent9d31138f53c0bee9193af73850ab6febddd29f51 (diff)
parent3bf92a281bdc6ebf2ec5975729d02bd9062e11f5 (diff)
Merge remote branch 'origin/nvc0'
Diffstat (limited to 'src/gallium/drivers/nouveau/nouveau_winsys.h')
-rw-r--r--src/gallium/drivers/nouveau/nouveau_winsys.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index 8dfb84a596..484f870bd8 100644
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -9,7 +9,6 @@
#include "nouveau/nouveau_device.h"
#include "nouveau/nouveau_grobj.h"
#include "nouveau/nouveau_notifier.h"
-#include "nouveau/nouveau_resource.h"
#ifndef NOUVEAU_NVC0
#include "nouveau/nv04_pushbuf.h"
#endif