diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
---|---|---|
committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
commit | 2f7f7ceccab4176217c399502b3ff95df1517627 (patch) | |
tree | 1a9f6e6c8ebcf5b13d9877685fce91b87a971ed2 /nouveau/nouveau_private.h | |
parent | d6059c3dd1300662e941ccd5e55649534fbb9a63 (diff) | |
parent | 6d3b8bbddd44b42d89adb1aafb7645e7f802673a (diff) |
Merge branch 'master' into libkms-master
Conflicts:
configure.ac
Diffstat (limited to 'nouveau/nouveau_private.h')
-rw-r--r-- | nouveau/nouveau_private.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nouveau/nouveau_private.h b/nouveau/nouveau_private.h index 784afc91..39758d18 100644 --- a/nouveau/nouveau_private.h +++ b/nouveau/nouveau_private.h @@ -64,6 +64,8 @@ struct nouveau_pushbuf_priv { int nouveau_pushbuf_init(struct nouveau_channel *); +void +nouveau_pushbuf_fini(struct nouveau_channel *); struct nouveau_channel_priv { struct nouveau_channel base; |