diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-08-06 16:30:10 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:13:00 +1000 |
| commit | c4837d27945b9b607b5a7274a33059e73d1a7831 (patch) | |
| tree | 1bd681f3dd33ed9bfd1accd880a58116b25ee225 /drivers/gpu/drm/nouveau/core/include/subdev/vm.h | |
| parent | b10f20d590aa040e4028c04a70a27b9ad6650ba8 (diff) | |
drm/nouveau/core: remove some left-over pieces from the porting process
Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/include/subdev/vm.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/include/subdev/vm.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/vm.h b/drivers/gpu/drm/nouveau/core/include/subdev/vm.h index 747781c2371d..66a4473f3a54 100644 --- a/drivers/gpu/drm/nouveau/core/include/subdev/vm.h +++ b/drivers/gpu/drm/nouveau/core/include/subdev/vm.h @@ -25,14 +25,11 @@ #ifndef __NOUVEAU_VM_H__ #define __NOUVEAU_VM_H__ -#ifndef XXX_THIS_IS_A_HACK #include <core/object.h> #include <core/subdev.h> #include <core/device.h> -#endif #include <core/mm.h> -#ifndef XXX_THIS_IS_A_HACK struct nouveau_vm_pgt { struct nouveau_gpuobj *obj[2]; u32 refcount[2]; @@ -42,7 +39,6 @@ struct nouveau_vm_pgd { struct list_head head; struct nouveau_gpuobj *obj; }; -#endif struct nouveau_gpuobj; struct nouveau_mem; @@ -69,7 +65,6 @@ struct nouveau_vm { u32 lpde; }; -#ifndef XXX_THIS_IS_A_HACK struct nouveau_vmmgr { struct nouveau_subdev base; @@ -129,7 +124,6 @@ int nouveau_vm_create(struct nouveau_vmmgr *, u64 offset, u64 length, u64 mm_offset, u32 block, struct nouveau_vm **); int nouveau_vm_new(struct nouveau_device *, u64 offset, u64 length, u64 mm_offset, struct nouveau_vm **); -#endif int nouveau_vm_ref(struct nouveau_vm *, struct nouveau_vm **, struct nouveau_gpuobj *pgd); int nouveau_vm_get(struct nouveau_vm *, u64 size, u32 page_shift, |