From nobody Wed Sep 25 16:50:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XDN5C06Nhz5XRxr; Wed, 25 Sep 2024 16:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XDN5B5mvBz4YLx; Wed, 25 Sep 2024 16:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727283022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=guy/uvytq14L0QhfBpnOEB9MpCumtuT14c74lZfbYRg=; b=mIueqCi7iDWapfW/VbzZ8UBIxkcfKWvebRQLmlUAAFzMs9ApEZV8b7LNG5PshsMGoTYXkk tXq5+yX3A9K4VHSNHR9kNdkIUrDMBFLyeMq/YxDg7r5dlB7hqtkL1Qo1nlueK27aT73u4Q mwU3vGe/NnAAGhi09YZlVMQQ3KQVz7id8Uetmsrstojk8mb4jU+lFQ76TU4fniri6uFCo2 ojQl/Secu3NEV0WqtmYO7GoOu5IjtGnTzEbVg4lFxek1RB/6H/WnTjZuF8ipGdDX+BH5Q0 u2G5HpYGQX8o3rRrHKYJJi70yS7yUsjkq6mZk7lsGmEyeWEx1hen4jSRzxc1ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727283022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=guy/uvytq14L0QhfBpnOEB9MpCumtuT14c74lZfbYRg=; b=kriDfA2AFljB+SVR0PSp3OeazkYzLlKZOG+1yXlTNTtiu2xw66ZUe5Kz/5tLb0MIQyek33 6d0a6BWD+pawOcemNFB/X28lAS7pQewacABW9daViyUABJDO08lyY265eSwfmJkDotiiG1 8Tbxwno4dgSV9mr1CrsGOpk1cDGfShfRjVGL6VCewoaAhgvRAx/Pf8jkz2b8wWNaTpF4Fv mzeP6NuaiR61y2Pe2bmqy9rBnvXfJfctQerDqGCx9RvLQE5/IMbkofXkaQMyy/XTXxSEZn Ou2tGUDIo1a1T/rWVxDT+w0dMr1o5AA2Ez8zgARY74HxX7Hy3I9K6C2tAecC6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727283022; a=rsa-sha256; cv=none; b=GpyReQZHt7De7dorHUsQohJ0NsxTsnRoNqAmxjG4yNcHht6ksaOAGpj5aMtuiKSf6fyHo1 JzYaFKvuJRSdvrbPjKb5mj+x1qS8ujGEd9Vrm5cXwzr6ptruE5bINtHIwuiy1VugwyFrcx X56yVSsrIQk7gNbA0tqIxbicsYUneJhfcBfHlwZT9tDBVev6jNJ0VDhdnPSWVfXtvpB4bn k2FduKuZetFxtBfnmMBi2ffUmtseraP8hliNHI6di9RLgyuZHXS39U2pLbcpHxLVLJYYAh Ej4jsppjwvqVUrFyIQIyQfHZo/iA67vSiFNkrZdMaink/J8JnHOSTKdC+tD92A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XDN5B5NL0zLCb; Wed, 25 Sep 2024 16:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48PGoM0C004798; Wed, 25 Sep 2024 16:50:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48PGoMtx004794; Wed, 25 Sep 2024 16:50:22 GMT (envelope-from git) Date: Wed, 25 Sep 2024 16:50:22 GMT Message-Id: <202409251650.48PGoMtx004794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5754008f8511 - stable/14 - hda: remove duplicate codec defines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5754008f8511ba95d84a35a1a91ff4e0682dee99 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5754008f8511ba95d84a35a1a91ff4e0682dee99 commit 5754008f8511ba95d84a35a1a91ff4e0682dee99 Author: Pavel Timofeev AuthorDate: 2024-09-22 10:40:36 +0000 Commit: Ed Maste CommitDate: 2024-09-25 13:17:26 +0000 hda: remove duplicate codec defines Reviewed by: emaste Fixes: 35e492f3bd41 ("Update list of Conexant and Realtek codecs.") Differential Revision: https://reviews.freebsd.org/D45965 (cherry picked from commit 4004e1752ec7992eeace7f0318d2ca3fc7ba9e03) --- sys/dev/sound/pci/hda/hdac.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 4b4bd70f800f..5e66e8eaed59 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -586,8 +586,6 @@ #define HDA_CODEC_ALC295 HDA_CODEC_CONSTRUCT(REALTEK, 0x0295) #define HDA_CODEC_ALC298 HDA_CODEC_CONSTRUCT(REALTEK, 0x0298) #define HDA_CODEC_ALC299 HDA_CODEC_CONSTRUCT(REALTEK, 0x0299) -#define HDA_CODEC_ALC292 HDA_CODEC_CONSTRUCT(REALTEK, 0x0292) -#define HDA_CODEC_ALC295 HDA_CODEC_CONSTRUCT(REALTEK, 0x0295) #define HDA_CODEC_ALC300 HDA_CODEC_CONSTRUCT(REALTEK, 0x0300) #define HDA_CODEC_ALC623 HDA_CODEC_CONSTRUCT(REALTEK, 0x0623) #define HDA_CODEC_ALC660 HDA_CODEC_CONSTRUCT(REALTEK, 0x0660)