Minor changes to make linux-solo build again

diff --git a/configs/linux-solo b/configs/linux-solo
index d9bb624c3b6fab9d08ff52752b8b22354e873bac..9df35725d0e0130efe4e9193375885a9d0461547 100644 (file)
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -14,9 +14,6 @@ CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
 
 CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
 
-
-ASM_SOURCES = $(X86_SOURCES)
-
 # Library/program dependencies
 DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS = -lm -lpthread -ldl

diff --git a/src/mesa/drivers/dri/common/mmio.h b/src/mesa/drivers/dri/common/mmio.h
index d9fa3dec5f25d558c4111260b0cdb88b377fd5c0..2b7b4123e5abc2fac70624793c584a0402edb654 100644 (file)
--- a/src/mesa/drivers/dri/common/mmio.h
+++ b/src/mesa/drivers/dri/common/mmio.h
@@ -33,6 +33,8 @@
 #ifndef MMIO_H
 #define MMIO_H
 
+#include "glheader.h"
+
 #if defined( __powerpc__ )
 
 static __inline__ u_int32_t