diff options
| author | Ben Skeggs <[email protected]> | 2008-09-11 06:09:05 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-09-11 06:09:05 +1000 |
| commit | 7158203b081ad34c03382f07e0df748eae235e9b (patch) | |
| tree | ee61efebbafb5464ec090c21b5e05533588789a1 /configs/linux-dri | |
| parent | 02025148c28d03d644e3d66dde1a423fe21e1c44 (diff) | |
| parent | eb5b16d278e0f7ee0121049e43dfee1d52f2b0f7 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/default
Diffstat (limited to 'configs/linux-dri')
| -rw-r--r-- | configs/linux-dri | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configs/linux-dri b/configs/linux-dri index ce5d2b7d174..8db6e419399 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -55,8 +55,7 @@ EGL_DRIVERS_DIRS = demo dri xdri DRIVER_DIRS = WINDOW_SYSTEM = dri -GALLIUM_WINSYS_DIRS = dri egl_xlib -GALLIUM_WINSYS_COMMON_DIRS = intel_drm +GALLIUM_WINSYS_DIRS = drm egl_xlib # gamma are missing because they have not been converted to use the new # interface. |