git: d72d5ced80f1 - main - arm64: std.allwinner: Fix mismerge

[Emmanuel Vadot]

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=d72d5ced80f1eb63bb17ea91c18bf58bbfb7464f

commit d72d5ced80f1eb63bb17ea91c18bf58bbfb7464f
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-07-18 16:35:47 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
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