From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 20 Dec 2010 20:30:39 +0000 (+1000)
Subject: Merge remote branch 'origin/master' into nvc0-new
X-Git-Tag: 062012170305~8104^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e52ebd6e8587e2e37ed65ad9fc9035c2bd00b563;p=profile%2Fivi%2Fmesa.git

Merge remote branch 'origin/master' into nvc0-new

Conflicts:
	src/gallium/drivers/nouveau/nouveau_winsys.h
---

e52ebd6e8587e2e37ed65ad9fc9035c2bd00b563
diff --cc src/gallium/drivers/nouveau/nouveau_winsys.h
index e7acbe6,747b084..8dfb84a
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@@ -10,9 -10,7 +10,9 @@@
  #include "nouveau/nouveau_grobj.h"
  #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
  #define NV04_PFIFO_MAX_PACKET_LEN 2047