Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / gallium / winsys / g3dvl / nouveau / nouveau_bo.c

diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_bo.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_bo.c
index 73ac4a4171a354939374d68d361c13aa4489a9ed..1005282dd4d11850b063f1004be45deea333dfdc 120000 (symlink)
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_bo.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_bo.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_bo.c
\ No newline at end of file
+../../drm/nouveau/nouveau_bo.c
\ No newline at end of file