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/fb.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/fb.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/include/subdev/fb.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/fb.h b/drivers/gpu/drm/nouveau/core/include/subdev/fb.h index f18c1a1e121c..5c1b5e1904f9 100644 --- a/drivers/gpu/drm/nouveau/core/include/subdev/fb.h +++ b/drivers/gpu/drm/nouveau/core/include/subdev/fb.h @@ -1,10 +1,8 @@ #ifndef __NOUVEAU_FB_H__ #define __NOUVEAU_FB_H__ -#ifndef XXX_THIS_IS_A_HACK #include <core/subdev.h> #include <core/device.h> -#endif #include <core/mm.h> #include <subdev/vm.h> @@ -50,7 +48,6 @@ struct nouveau_fb_tile { u32 zcomp; }; -#ifndef XXX_THIS_IS_A_HACK struct nouveau_fb { struct nouveau_subdev base; @@ -133,6 +130,5 @@ void nv30_fb_tile_fini(struct nouveau_fb *, int i, struct nouveau_fb_tile *); void nv50_fb_vram_del(struct nouveau_fb *, struct nouveau_mem **); void nv50_fb_trap(struct nouveau_fb *, int display); -#endif #endif |