diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2011-01-04 18:20:05 +0100 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2011-01-04 18:20:05 +0100 |
| commit | cd1cf788280a1eb10d54e1a2b8b069ed7b89c724 (patch) | |
| tree | 97a2241e1e51cab4b6bf004fc9c0c3f65468d6d2 /src/gallium/drivers/nouveau/nouveau_screen.h | |
| parent | c94996f0570c729b9cb2b55329ababb9877fbbea (diff) | |
| parent | 4884ca5f67a0138659e48700e8b2f8821400c995 (diff) | |
Merge remote branch 'origin/nvc0'
Diffstat (limited to 'src/gallium/drivers/nouveau/nouveau_screen.h')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_screen.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.h b/src/gallium/drivers/nouveau/nouveau_screen.h index 8c290273fb..1f4e5171c0 100644 --- a/src/gallium/drivers/nouveau/nouveau_screen.h +++ b/src/gallium/drivers/nouveau/nouveau_screen.h @@ -66,7 +66,7 @@ void nouveau_screen_fini(struct nouveau_screen *); - +#ifndef NOUVEAU_NVC0 static INLINE unsigned RING_3D(unsigned mthd, unsigned size) { @@ -78,5 +78,6 @@ RING_3D_NI(unsigned mthd, unsigned size) { return 0x40000000 | (7 << 13) | (size << 18) | mthd; } +#endif #endif |