Date: Fri, 30 Oct 2009 18:30:13 +0000 (UTC) From: Robert Noland <rnoland@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r198697 - head/sys/dev/drm Message-ID: <200910301830.n9UIUDFJ054353@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rnoland Date: Fri Oct 30 18:30:13 2009 New Revision: 198697 URL: http://svn.freebsd.org/changeset/base/198697 Log: Fix botched git -> svn merge. MFC after: 2 weeks Modified: head/sys/dev/drm/drm_scatter.c Modified: head/sys/dev/drm/drm_scatter.c ============================================================================== --- head/sys/dev/drm/drm_scatter.c Fri Oct 30 18:08:46 2009 (r198696) +++ head/sys/dev/drm/drm_scatter.c Fri Oct 30 18:30:13 2009 (r198697) @@ -65,7 +65,7 @@ drm_sg_alloc(struct drm_device *dev, str ret = bus_dma_tag_create(NULL, PAGE_SIZE, 0, /* tag, align, boundary */ BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, /* lowaddr, highaddr */ NULL, NULL, /* filtfunc, filtfuncargs */ - request->size, pages, /* maxsize, nsegs */ + request->size, entry->pages, /* maxsize, nsegs */ PAGE_SIZE, 0, /* maxsegsize, flags */ NULL, NULL, /* lockfunc, lockfuncargs */ &dmah->tag);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910301830.n9UIUDFJ054353>