move config options to same place as other drivers (again for S3TC patch later)

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 12489433bc3aa91f5823297a19ae7c4fed136821..29f5c64812883d518e51142312c4db3c74140bf3 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -68,9 +68,6 @@ char *prevLockFile;
 int prevLockLine;
 #endif
 
-const char __driConfigOptions[] = { 0 };
-const GLuint __driNConfigOptions = 0;
-
 /***************************************
  * Mesa's Driver Functions
  ***************************************/

diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 0b033bb939d8b9d178155734d32fe5bc95839fc3..e7e9b12915445bd2726983a8ecd51a5cc730d233 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -43,6 +43,9 @@
 
 #include "i830_dri.h"
 
+const char __driConfigOptions[] = { 0 };
+const GLuint __driNConfigOptions = 0;
+
 #ifdef USE_NEW_INTERFACE
 static PFNGLXCREATECONTEXTMODES create_context_modes = NULL;
 #endif /*USE_NEW_INTERFACE*/