diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-27 12:53:13 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-27 12:53:13 +0800 |
| commit | 406a894e529267177e6161c1713f2aa2293e7734 (patch) | |
| tree | ddec9c8bca52bd4d5b6d65f8b85c10760e3c783f /shared-core/nouveau_drm.h | |
| parent | ddc87d302526347f670e8b61e227c0eb05c15cde (diff) | |
| parent | 674cefd4fe4b537a20a10edcb4ec5df55facca8e (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
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 |