diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-21 17:00:43 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-21 17:00:43 +0800 |
| commit | 0467ad41188031073cbbad1139a916e2439af2f1 (patch) | |
| tree | aff3efec2713270322125cadf07c62b87c5a2127 /shared-core/nouveau_drv.h | |
| parent | fe4cc50983bdaf51bf29ef041f65e0007f547844 (diff) | |
| parent | e22225416a12c2beab7a5bcb866d214ee212cbc4 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'shared-core/nouveau_drv.h')
| -rw-r--r-- | shared-core/nouveau_drv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h index c27c93ea..92aea31c 100644 --- a/shared-core/nouveau_drv.h +++ b/shared-core/nouveau_drv.h @@ -34,7 +34,7 @@ #define DRIVER_MAJOR 0 #define DRIVER_MINOR 0 -#define DRIVER_PATCHLEVEL 4 +#define DRIVER_PATCHLEVEL 5 #define NOUVEAU_FAMILY 0x0000FFFF #define NOUVEAU_FLAGS 0xFFFF0000 @@ -187,7 +187,7 @@ extern void nouveau_instmem_w32(drm_nouveau_private_t *dev_priv, extern int nouveau_fifo_init(drm_device_t *dev); extern int nouveau_fifo_number(drm_device_t *dev); extern void nouveau_fifo_cleanup(drm_device_t *dev, DRMFILE filp); -extern int nouveau_fifo_id_get(drm_device_t *dev, DRMFILE filp); +extern int nouveau_fifo_owner(drm_device_t *dev, DRMFILE filp, int channel); extern void nouveau_fifo_free(drm_device_t *dev, int channel); /* nouveau_object.c */ |