diff options
| author | Keith Whitwell <[email protected]> | 2010-02-05 09:50:21 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-02-05 09:50:21 +0000 |
| commit | c036d13d7d2cc905226fe53ebd86a18da808963f (patch) | |
| tree | 1520a41a750b3a2a2685c3d7f46e87f921ad7b83 /src/gallium/drivers/nv30 | |
| parent | 69f20294cd8bed52e4a9b648158423c5f0754941 (diff) | |
| parent | 5b6b67eb3ff714fbba8aed88a22a7646e1dbf655 (diff) | |
Merge commit 'fj/mesa-next'
Diffstat (limited to 'src/gallium/drivers/nv30')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_miptree.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_screen.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c index ea8a610fe69..c29c36e20aa 100644 --- a/src/gallium/drivers/nv30/nv30_miptree.c +++ b/src/gallium/drivers/nv30/nv30_miptree.c @@ -5,7 +5,7 @@ #include "util/u_math.h" #include "nv30_context.h" -#include "../nv04/nv04_surface_2d.h" +#include "../nouveau/nv04_surface_2d.h" static void nv30_miptree_layout(struct nv30_miptree *nv30mt) diff --git a/src/gallium/drivers/nv30/nv30_screen.h b/src/gallium/drivers/nv30/nv30_screen.h index 5fbd998b539..744a72de91a 100644 --- a/src/gallium/drivers/nv30/nv30_screen.h +++ b/src/gallium/drivers/nv30/nv30_screen.h @@ -3,7 +3,7 @@ #include "nouveau/nouveau_screen.h" -#include "nv04/nv04_surface_2d.h" +#include "nouveau/nv04_surface_2d.h" struct nv30_screen { struct nouveau_screen base; |