From owner-svn-src-all@FreeBSD.ORG  Wed Jan 11 21:03:54 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A591106564A;
	Wed, 11 Jan 2012 21:03:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6973F8FC17;
	Wed, 11 Jan 2012 21:03:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0BL3sAh076591;
	Wed, 11 Jan 2012 21:03:54 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0BL3svp076589;
	Wed, 11 Jan 2012 21:03:54 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201201112103.q0BL3svp076589@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Wed, 11 Jan 2012 21:03:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229980 - head/sys/dev/sound/pci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jan 2012 21:03:54 -0000

Author: pfg
Date: Wed Jan 11 21:03:54 2012
New Revision: 229980
URL: http://svn.freebsd.org/changeset/base/229980

Log:
  Fix an inconsistency that crept in while replacing constants
  from the new header.
  
  Approved by:	jhb (mentor)
  MFC after:	3 days

Modified:
  head/sys/dev/sound/pci/emu10k1.c

Modified: head/sys/dev/sound/pci/emu10k1.c
==============================================================================
--- head/sys/dev/sound/pci/emu10k1.c	Wed Jan 11 20:04:52 2012	(r229979)
+++ head/sys/dev/sound/pci/emu10k1.c	Wed Jan 11 21:03:54 2012	(r229980)
@@ -1079,9 +1079,9 @@ emurchan_trigger(kobj_t obj, void *data,
 		emu_wrptr(sc, 0, ch->sizereg, sz);
 		if (ch->num == 0) {
 			if (sc->audigy) {
-				val = EMU_ADCCR_LCHANENABLE;
+				val = EMU_A_ADCCR_LCHANENABLE;
 				if (AFMT_CHANNEL(ch->fmt) > 1)
-					val |= EMU_ADCCR_RCHANENABLE;
+					val |= EMU_A_ADCCR_RCHANENABLE;
 				val |= audigy_recval(ch->spd);
 			} else {
 				val = EMU_ADCCR_LCHANENABLE;