summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Packard <[email protected]>2007-01-07 20:57:56 -0800
committerKeith Packard <[email protected]>2007-01-07 20:57:56 -0800
commit6a632de96dca87a28fe03afb3a9bac3b4a3519d7 (patch)
treeb8a6f9ebf06700e205f08bf148ef2fc86ad53835
parent92de58f00162a6b3c40bf12635f3ee4f0480e09a (diff)
parent026939b00897665f97669bafb1d486a71f90f935 (diff)
Merge branch 'origin' into crestline
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_object.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_object.h b/src/mesa/drivers/dri/nouveau/nouveau_object.h
index d5fcc6df8d2..b1ff5a5d0dc 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_object.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_object.h
@@ -3,7 +3,7 @@
#include "nouveau_context.h"
-//#define ALLOW_MULTI_SUBCHANNEL
+#define ALLOW_MULTI_SUBCHANNEL
void nouveauObjectInit(nouveauContextPtr nmesa);