From owner-cvs-src-old@FreeBSD.ORG  Thu Apr  2 17:53:39 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F0AB210657B6
	for <cvs-src-old@freebsd.org>; Thu,  2 Apr 2009 17:53:39 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 153BB8FC14
	for <cvs-src-old@freebsd.org>; Thu,  2 Apr 2009 17:53:39 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n32HrcvJ081713
	for <cvs-src-old@freebsd.org>; Thu, 2 Apr 2009 17:53:38 GMT
	(envelope-from rnoland@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n32HrcQP081712
	for cvs-src-old@freebsd.org; Thu, 2 Apr 2009 17:53:38 GMT
	(envelope-from rnoland@repoman.freebsd.org)
Message-Id: <200904021753.n32HrcQP081712@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rnoland@repoman.freebsd.org using -f
From: Robert Noland <rnoland@FreeBSD.org>
Date: Thu, 2 Apr 2009 17:53:30 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/sys/dev/drm ati_pcigart.c drm_scatter.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Apr 2009 17:53:41 -0000

rnoland     2009-04-02 17:53:30 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/dev/drm          ati_pcigart.c drm_scatter.c 
  Log:
  SVN rev 190647 on 2009-04-02 17:53:30Z by rnoland
  
  Merge 190123,190282
  
  Fix up the flags to bus_dmamem again.  The man page incorrectly showed
  the BUS_DMA_NOCACHE flags as being a valid flag for load instead of alloc.
  
  Approved by:    re (kib)
  
  Revision  Changes    Path
  1.3.2.2   +4 -3      src/sys/dev/drm/ati_pcigart.c
  1.3.2.4   +2 -3      src/sys/dev/drm/drm_scatter.c