From owner-dev-commits-src-main@freebsd.org Sun Jul 18 16:36:22 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5C74A66D46C; Sun, 18 Jul 2021 16:36:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GSVwk25m4z3JYC; Sun, 18 Jul 2021 16:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 292C526C4E; Sun, 18 Jul 2021 16:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16IGaM61029986; Sun, 18 Jul 2021 16:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16IGaMva029985; Sun, 18 Jul 2021 16:36:22 GMT (envelope-from git) Date: Sun, 18 Jul 2021 16:36:22 GMT Message-Id: <202107181636.16IGaMva029985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: d72d5ced80f1 - main - arm64: std.allwinner: Fix mismerge MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d72d5ced80f1eb63bb17ea91c18bf58bbfb7464f Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 16:36:22 -0000 The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d72d5ced80f1eb63bb17ea91c18bf58bbfb7464f commit d72d5ced80f1eb63bb17ea91c18bf58bbfb7464f Author: Emmanuel Vadot AuthorDate: 2021-07-18 16:35:47 +0000 Commit: Emmanuel Vadot CommitDate: 2021-07-18 16:35:47 +0000 arm64: std.allwinner: Fix mismerge Re-add aw_r_intc and remove duplicate a10_codec --- sys/arm64/conf/std.allwinner | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/conf/std.allwinner b/sys/arm64/conf/std.allwinner index 851e158a5648..71d71300c9b1 100644 --- a/sys/arm64/conf/std.allwinner +++ b/sys/arm64/conf/std.allwinner @@ -25,6 +25,7 @@ device sy8106a # SY8106A Buck Regulator device aw_ccu # Allwinner clock controller # Interrupt controllers +device aw_r_intc # Allwinner RINTC support device aw_nmi # Allwinner NMI support # Real-time clock support @@ -57,7 +58,6 @@ device dwc3 # Synopsys DWC controller device aw_dwc3 # Allwinner DWC3 controller # Sound support -device a10_codec device a10_codec # Allwinner A10 codec device aw_i2s # Allwinner I2S device a33_codec # Allwinner A33 codec