Merge branch 'origin' into crestline

This commit is contained in:
Keith Packard 2007-01-07 20:57:56 -08:00
commit 6a632de96d

View file

@ -3,7 +3,7 @@
#include "nouveau_context.h"
//#define ALLOW_MULTI_SUBCHANNEL
#define ALLOW_MULTI_SUBCHANNEL
void nouveauObjectInit(nouveauContextPtr nmesa);