diff options
| author | Eric Anholt <eric@anholt.net> | 2007-03-30 12:56:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-03-30 12:56:08 -0700 |
| commit | cd4c82176f3f429e722ca3fac2abf231af479780 (patch) | |
| tree | 6c658f8ea8cbfcdbb5d3c8518a5f13ca90b465e3 /shared-core/nouveau_drm.h | |
| parent | 5d69640a6ad15522fa37c3b232eb34acef955892 (diff) | |
| parent | 3f70518f0bcf36a1e2c82db962324dbdee106f67 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'shared-core/nouveau_drm.h')
| -rw-r--r-- | shared-core/nouveau_drm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/nouveau_drm.h b/shared-core/nouveau_drm.h index c3a69a8f..3ba7e961 100644 --- a/shared-core/nouveau_drm.h +++ b/shared-core/nouveau_drm.h @@ -25,7 +25,7 @@ #ifndef __NOUVEAU_DRM_H__ #define __NOUVEAU_DRM_H__ -#define NOUVEAU_DRM_HEADER_PATCHLEVEL 5 +#define NOUVEAU_DRM_HEADER_PATCHLEVEL 6 typedef struct drm_nouveau_fifo_alloc { int channel; @@ -142,7 +142,7 @@ drm_nouveau_sarea_t; #define DRM_NOUVEAU_FIFO_ALLOC 0x00 #define DRM_NOUVEAU_OBJECT_INIT 0x01 -#define DRM_NOUVEAU_DMA_OBJECT_INIT 0x02 // We don't want this eventually.. +#define DRM_NOUVEAU_DMA_OBJECT_INIT 0x02 #define DRM_NOUVEAU_MEM_ALLOC 0x03 #define DRM_NOUVEAU_MEM_FREE 0x04 #define DRM_NOUVEAU_GETPARAM 0x05 |