From owner-cvs-all@FreeBSD.ORG  Wed Feb  6 08:33:15 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8DB8416A418;
	Wed,  6 Feb 2008 08:33:15 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 76B6F13C455;
	Wed,  6 Feb 2008 08:33:15 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m168XFmw084814;
	Wed, 6 Feb 2008 08:33:15 GMT
	(envelope-from scottl@repoman.freebsd.org)
Received: (from scottl@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m168XFDD084813;
	Wed, 6 Feb 2008 08:33:15 GMT (envelope-from scottl)
Message-Id: <200802060833.m168XFDD084813@repoman.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Wed, 6 Feb 2008 08:33:15 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_7
Cc: 
Subject: cvs commit: src/sys/dev/hptrr hptrr_os_bsd.c osm.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Feb 2008 08:33:15 -0000

scottl      2008-02-06 08:33:15 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/dev/hptrr        hptrr_os_bsd.c osm.h 
  Log:
  Fix a symbol conflict between hptrr and hptmv
  
  Revision  Changes    Path
  1.1.2.3   +1 -1      src/sys/dev/hptrr/hptrr_os_bsd.c
  1.1.2.3   +2 -2      src/sys/dev/hptrr/osm.h