Module Name: src
Committed By: jmcneill
Date: Wed May 5 20:58:03 UTC 2021
Modified Files:
src/sys/arch/arm/sunxi: sunxi_codec.c sunxi_codec.h
Log Message:
Fix GENERIC64 build
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/sunxi/sunxi_codec.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/sunxi/sunxi_codec.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_codec.c
diff -u src/sys/arch/arm/sunxi/sunxi_codec.c:1.13 src/sys/arch/arm/sunxi/sunxi_codec.c:1.14
--- src/sys/arch/arm/sunxi/sunxi_codec.c:1.13 Wed May 5 10:24:04 2021
+++ src/sys/arch/arm/sunxi/sunxi_codec.c Wed May 5 20:58:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_codec.c,v 1.13 2021/05/05 10:24:04 jmcneill Exp $ */
+/* $NetBSD: sunxi_codec.c,v 1.14 2021/05/05 20:58:03 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_codec.c,v 1.13 2021/05/05 10:24:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_codec.c,v 1.14 2021/05/05 20:58:03 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -89,10 +89,10 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_codec.
#define AC_ADC_CNT(_sc) ((_sc)->sc_cfg->ADC_CNT)
static const struct device_compatible_entry compat_data[] = {
- A10_CODEC_COMPATDATA,
- A31_CODEC_COMPATDATA,
- H3_CODEC_COMPATDATA,
- V3S_CODEC_COMPATDATA,
+ A10_CODEC_COMPATDATA
+ A31_CODEC_COMPATDATA
+ H3_CODEC_COMPATDATA
+ V3S_CODEC_COMPATDATA
DEVICE_COMPAT_EOL
};
Index: src/sys/arch/arm/sunxi/sunxi_codec.h
diff -u src/sys/arch/arm/sunxi/sunxi_codec.h:1.7 src/sys/arch/arm/sunxi/sunxi_codec.h:1.8
--- src/sys/arch/arm/sunxi/sunxi_codec.h:1.7 Wed May 5 10:24:04 2021
+++ src/sys/arch/arm/sunxi/sunxi_codec.h Wed May 5 20:58:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_codec.h,v 1.7 2021/05/05 10:24:04 jmcneill Exp $ */
+/* $NetBSD: sunxi_codec.h,v 1.8 2021/05/05 20:58:03 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -121,7 +121,7 @@ struct sunxi_codec_softc {
extern const struct sunxi_codec_conf sun8i_h3_codecconf;
#define H3_CODEC_COMPATDATA \
{ .compat = "allwinner,sun8i-h3-codec", \
- .data = &sun8i_h3_codecconf }
+ .data = &sun8i_h3_codecconf },
#else
#define H3_CODEC_COMPATDATA
#endif
@@ -130,7 +130,7 @@ extern const struct sunxi_codec_conf sun
extern const struct sunxi_codec_conf sun8i_v3s_codecconf;
#define V3S_CODEC_COMPATDATA \
{ .compat = "allwinner,sun8i-v3s-codec", \
- .data = &sun8i_v3s_codecconf }
+ .data = &sun8i_v3s_codecconf },
#else
#define V3S_CODEC_COMPATDATA
#endif
@@ -140,11 +140,11 @@ extern const struct sunxi_codec_conf sun
{ .compat = "allwinner,sun4i-a10-codec", \
.data = &sun4i_a10_codecconf }, \
{ .compat = "allwinner,sun7i-a20-codec", \
- .data = &sun4i_a10_codecconf }
+ .data = &sun4i_a10_codecconf },
extern const struct sunxi_codec_conf sun6i_a31_codecconf;
#define A31_CODEC_COMPATDATA \
{ .compat = "allwinner,sun6i-a31-codec", \
- .data = &sun6i_a31_codecconf }
+ .data = &sun6i_a31_codecconf },
#endif /* !_ARM_SUNXI_CODEC_H */
