Re: [Nouveau] [PATCH] drm: Fix duplicate definition of NV04_PFB_BOOT_0_*

2014-08-18 Thread Ben Skeggs
On Tue, Aug 19, 2014 at 6:32 AM, Pierre Moreau wrote: > Signed-off-by: Pierre Moreau Thanks Pierre, I've pulled both patches. > --- > drm/core/include/subdev/fb/regsnv04.h | 1 + > nvkm/include/subdev/fb/regsnv04.h | 21 + > nvkm/subdev/devinit/fbmem.h | 18 +

[Nouveau] [PATCH] drm: Fix duplicate definition of NV04_PFB_BOOT_0_*

2014-08-18 Thread Pierre Moreau
Signed-off-by: Pierre Moreau --- drm/core/include/subdev/fb/regsnv04.h | 1 + nvkm/include/subdev/fb/regsnv04.h | 21 + nvkm/subdev/devinit/fbmem.h | 18 ++ nvkm/subdev/fb/ramnv04.c | 17 + 4 files changed, 25 inserti