Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

[mesa.git] / configs / linux-dri

diff --git a/configs/linux-dri b/configs/linux-dri
index 193d0a550abc2cada72ee17427af45220e364838..4fdef196d968eac6c5a36f73e1a797643634ea24 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -54,7 +54,6 @@ USING_EGL=0
 
 # Directories
 SRC_DIRS := glx/x11 $(SRC_DIRS)
-PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 ifeq ($(USING_EGL), 1)
 SRC_DIRS := egl $(SRC_DIRS)
 PROGRAM_DIRS = egl
@@ -68,4 +67,4 @@ GALLIUM_WINSYS_DIRS = dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = intel 
+DRI_DIRS = nouveau