nouveau: oops and make nouveau winsys build by default

diff --git a/configs/linux-dri b/configs/linux-dri
index 936fce9..494b0aa 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -66,4 +66,4 @@ WINDOW_SYSTEM=dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = intel_winsys 
+DRI_DIRS = intel_winsys nouveau_winsys

diff --git a/src/mesa/drivers/dri/nouveau_winsys/Makefile b/src/mesa/drivers/dri/nouveau_winsys/Makefile
index 59ba561..98ec5a7 100644 (file)
--- a/src/mesa/drivers/dri/nouveau_winsys/Makefile
+++ b/src/mesa/drivers/dri/nouveau_winsys/Makefile
@@ -8,7 +8,7 @@ MINIGLX_SOURCES =
 
 PIPE_DRIVERS = \
        $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a \
-       $(TOP)/src/mesa/pipe/nv40/libnv30.a \
+       $(TOP)/src/mesa/pipe/nv30/libnv30.a \
        $(TOP)/src/mesa/pipe/nv40/libnv40.a \
        $(TOP)/src/mesa/pipe/nv50/libnv50.a