From owner-cvs-src@FreeBSD.ORG  Sat Jan 21 15:23:15 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E95A016A41F;
	Sat, 21 Jan 2006 15:23:15 +0000 (GMT)
	(envelope-from netchild@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A564743D46;
	Sat, 21 Jan 2006 15:23:15 +0000 (GMT)
	(envelope-from netchild@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0LFNFU4087144;
	Sat, 21 Jan 2006 15:23:15 GMT
	(envelope-from netchild@repoman.freebsd.org)
Received: (from netchild@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0LFNFQK087143;
	Sat, 21 Jan 2006 15:23:15 GMT (envelope-from netchild)
Message-Id: <200601211523.k0LFNFQK087143@repoman.freebsd.org>
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Sat, 21 Jan 2006 15:23:15 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/dev/sound/pci emu10k1.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Jan 2006 15:23:16 -0000

netchild    2006-01-21 15:23:15 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/sound/pci    emu10k1.c 
  Log:
  Merge rev. 1.5 and 1.6 from DFly:
   - Add PCI identifier to match against a Dell OEM version of the SB Live!
   - Fix spurious warning about ANSI trigraphs
  
  Obtained from:  DragonFlyBSD
  
  Revision  Changes    Path
  1.57      +12 -7     src/sys/dev/sound/pci/emu10k1.c