diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-02-05 09:50:21 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-02-05 09:50:21 +0000 |
| commit | c036d13d7d2cc905226fe53ebd86a18da808963f (patch) | |
| tree | 1520a41a750b3a2a2685c3d7f46e87f921ad7b83 /src/gallium/drivers/nv40/nv40_miptree.c | |
| parent | 69f20294cd8bed52e4a9b648158423c5f0754941 (diff) | |
| parent | 5b6b67eb3ff714fbba8aed88a22a7646e1dbf655 (diff) | |
Merge commit 'fj/mesa-next'
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_miptree.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_miptree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv40/nv40_miptree.c b/src/gallium/drivers/nv40/nv40_miptree.c index d62627daa5..ad1a9a5195 100644 --- a/src/gallium/drivers/nv40/nv40_miptree.c +++ b/src/gallium/drivers/nv40/nv40_miptree.c @@ -5,7 +5,7 @@ #include "util/u_math.h" #include "nv40_context.h" -#include "../nv04/nv04_surface_2d.h" +#include "../nouveau/nv04_surface_2d.h" |